diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
index 6154aea..c25e02f 100644
--- a/.github/workflows/unittests.yml
+++ b/.github/workflows/unittests.yml
@@ -5,9 +5,10 @@ on: [push, pull_request]
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:  
-      matrix:  
-        python-version: ["3.8", "3.9", "3.10", "3.11"] 
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:  
       - uses: actions/checkout@v4
@@ -17,10 +18,11 @@ jobs:
           python-version: ${{ matrix.python-version }}  
       - name: Install dependencies  
         run: |  
-          python -m pip install --upgrade pip  
-          python setup.py install
+          python -m pip install --upgrade pip
+          pip install pytest
+          pip install --editable .
       - name: Run unittests  
-        run: |  
-          python tests/unit_tests.py
-          python tests/field_tests.py
-          python tests/csv_id_to_node_id_map_tests.py
+        run: pytest --ignore=tests/test_islandora.py
+                    --ignore=tests/test_islandora_check.py
+                    --ignore=tests/test_islandora_hooks.py
+                    --ignore=tests/test_islandora_paged_content.py
diff --git a/tests/csv_id_to_node_id_map_tests.py b/tests/test_csv_id_to_node_id_map.py
similarity index 100%
rename from tests/csv_id_to_node_id_map_tests.py
rename to tests/test_csv_id_to_node_id_map.py
diff --git a/tests/field_tests_values.py b/tests/test_field_values.py
similarity index 100%
rename from tests/field_tests_values.py
rename to tests/test_field_values.py
diff --git a/tests/field_tests.py b/tests/test_fields.py
similarity index 100%
rename from tests/field_tests.py
rename to tests/test_fields.py
diff --git a/tests/islandora_tests.py b/tests/test_islandora.py
similarity index 100%
rename from tests/islandora_tests.py
rename to tests/test_islandora.py
diff --git a/tests/islandora_tests_check.py b/tests/test_islandora_check.py
similarity index 100%
rename from tests/islandora_tests_check.py
rename to tests/test_islandora_check.py
diff --git a/tests/islandora_tests_hooks.py b/tests/test_islandora_hooks.py
similarity index 100%
rename from tests/islandora_tests_hooks.py
rename to tests/test_islandora_hooks.py
diff --git a/tests/islandora_tests_paged_content.py b/tests/test_islandora_paged_content.py
similarity index 100%
rename from tests/islandora_tests_paged_content.py
rename to tests/test_islandora_paged_content.py
diff --git a/tests/unit_tests.py b/tests/test_unit.py
similarity index 100%
rename from tests/unit_tests.py
rename to tests/test_unit.py
diff --git a/tests/unit_tests_workbench_config.py b/tests/test_unit_workbench_config.py
similarity index 100%
rename from tests/unit_tests_workbench_config.py
rename to tests/test_unit_workbench_config.py