diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
index 238c863..ce88c62 100644
--- a/.github/workflows/pythonpackage.yml
+++ b/.github/workflows/pythonpackage.yml
@@ -51,7 +51,7 @@ jobs:
       run: |
         python -m pip install dist/sqlcipher3-wheels-*.tar.gz
         mv sqlcipher3 sqlcipher3_ &&
-        python -m test &&
+        python -m unittest &&
         mv sqlcipher3_ sqlcipher3
 
     - uses: actions/upload-artifact@v3
@@ -159,7 +159,7 @@ jobs:
         CIBW_ENVIRONMENT: SQLCIPHER3_COMPILE_TARGET=${{ matrix.compile_target }}
         CIBW_TEST_COMMAND: >
           mv {project}/sqlcipher3 {project}/sqlcipher3_ &&
-          python -m unittest discover -t {project} -s test -p *.py &&
+          python -m unittest discover -s {project} &&
           mv {project}/sqlcipher3_ {project}/sqlcipher3
 
     - uses: actions/upload-artifact@v3
diff --git a/test/__main__.py b/test/__main__.py
index c05ca0c..86a16d4 100644
--- a/test/__main__.py
+++ b/test/__main__.py
@@ -2,14 +2,14 @@ import optparse
 import sys
 import unittest
 
-from test.backup import suite as backup_suite
-from test.dbapi import suite as dbapi_suite
-from test.factory import suite as factory_suite
-from test.hooks import suite as hooks_suite
-from test.regression import suite as regression_suite
-from test.transactions import suite as transactions_suite
-from test.ttypes import suite as types_suite
-from test.userfunctions import suite as userfunctions_suite
+from test.test_backup import suite as backup_suite
+from test.test_dbapi import suite as dbapi_suite
+from test.test_factory import suite as factory_suite
+from test.test_hooks import suite as hooks_suite
+from test.test_regression import suite as regression_suite
+from test.test_transactions import suite as transactions_suite
+from test.test_ttypes import suite as types_suite
+from test.test_userfunctions import suite as userfunctions_suite
 
 
 def test(verbosity=1, failfast=False):
diff --git a/test/backup.py b/test/test_backup.py
similarity index 100%
rename from test/backup.py
rename to test/test_backup.py
diff --git a/test/dbapi.py b/test/test_dbapi.py
similarity index 100%
rename from test/dbapi.py
rename to test/test_dbapi.py
diff --git a/test/factory.py b/test/test_factory.py
similarity index 100%
rename from test/factory.py
rename to test/test_factory.py
diff --git a/test/hooks.py b/test/test_hooks.py
similarity index 100%
rename from test/hooks.py
rename to test/test_hooks.py
diff --git a/test/regression.py b/test/test_regression.py
similarity index 100%
rename from test/regression.py
rename to test/test_regression.py
diff --git a/test/transactions.py b/test/test_transactions.py
similarity index 100%
rename from test/transactions.py
rename to test/test_transactions.py
diff --git a/test/ttypes.py b/test/test_ttypes.py
similarity index 100%
rename from test/ttypes.py
rename to test/test_ttypes.py
diff --git a/test/userfunctions.py b/test/test_userfunctions.py
similarity index 100%
rename from test/userfunctions.py
rename to test/test_userfunctions.py