diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
index ede0840..238c863 100644
--- a/.github/workflows/pythonpackage.yml
+++ b/.github/workflows/pythonpackage.yml
@@ -50,9 +50,9 @@ jobs:
     - name: Test sdist
       run: |
         python -m pip install dist/sqlcipher3-wheels-*.tar.gz
-        mv {project}/sqlcipher3 {project}/sqlcipher3_ &&
-        python -m unittest discover -t {project} -s test -p *.py &&
-        mv {project}/sqlcipher3_ {project}/sqlcipher3
+        mv sqlcipher3 sqlcipher3_ &&
+        python -m test &&
+        mv sqlcipher3_ sqlcipher3
 
     - uses: actions/upload-artifact@v3
       with:
diff --git a/setup.py b/setup.py
index 0a03022..3d2dadc 100644
--- a/setup.py
+++ b/setup.py
@@ -189,8 +189,11 @@ if __name__ == "__main__":
     )
 
     setup(
-        # name and version for building python 3.6 wheel
+        # With pyproject.toml, all are not necessary except ext_modules
+        # However, they are kept for building python 3.6 wheels
         name="sqlcipher3-wheels",
         version="0.5.2.post0",
+        package_dir={"sqlcipher3-wheels": "sqlcipher3"},
+        packages=["sqlcipher3-wheels"],
         ext_modules=[module],
     )