diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 58aaff6f9..159c4680b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,8 +24,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - python: "3.8"
-            pyshort: "38"
           - python: "3.9"
             pyshort: "39"
           - python: "3.11"
@@ -62,13 +60,13 @@ jobs:
           export OMP_NUM_THREADS=2
           export OPENBLAS_NUM_THREADS=2
           export MPI_DISABLE=1
-          python3 setup.py test
+          python3 -m unittest discover
 
       - name: Run MPI Tests
         run: |
           export OMP_NUM_THREADS=1
           export OPENBLAS_NUM_THREADS=1
-          mpirun -np 2 python3 setup.py test
+          python3 -m unittest discover
 
   # FIXME:  Re-enable after testing this procedure on a local
   # apple machine.
diff --git a/.gitignore b/.gitignore
index 7ecd9dfd7..bb277c3c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,3 +105,6 @@ venv.bak/
 
 # pychram
 .idea
+
+# vscode
+.vscode
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 0b496c3a6..1d6988dba 100644
--- a/setup.py
+++ b/setup.py
@@ -6,8 +6,7 @@
 
 import unittest
 
-from setuptools import find_packages, setup, Extension
-from setuptools.command.test import test as TestCommand
+from setuptools import find_packages, setup, Extension, Command
 
 import versioneer
 
@@ -43,7 +42,7 @@
 setup_opts["url"] = "https://github.com/simonsobs/sotodlib"
 setup_opts["packages"] = find_packages(where=".", exclude="tests")
 setup_opts["license"] = "MIT"
-setup_opts["python_requires"] = ">=3.8.0"
+setup_opts["python_requires"] = ">=3.9.0"
 setup_opts["package_data"] = {
     "sotodlib": [
         "toast/ops/data/*"
@@ -84,16 +83,16 @@
 
 # Class to run unit tests
 
-class SOTestCommand(TestCommand):
+class SOTestCommand(Command):
 
     def __init__(self, *args, **kwargs):
         super(SOTestCommand, self).__init__(*args, **kwargs)
 
     def initialize_options(self):
-        TestCommand.initialize_options(self)
+        Command.initialize_options(self)
 
     def finalize_options(self):
-        TestCommand.finalize_options(self)
+        Command.finalize_options(self)
         self.test_suite = True
 
     def mpi_world(self):