diff --git a/.circleci/config.yml b/.circleci/config.yml
index bc82c4fd0..234212d1b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -45,6 +45,13 @@ jobs:
             python3 -m cibuildwheel .
             # "/project" is the project path inside the cibuildwheel container itself
 
+      - run:
+          name: move tests results out of the wheelhouse
+          command: mv wheelhouse/test-results ./
+
+      - store_test_results:
+          path: test-results/
+
       - store_artifacts:
           path: wheelhouse/
 
diff --git a/pyproject.toml b/pyproject.toml
index b6140802e..79f7a7989 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,10 +7,10 @@ write_to = "schema_salad/_version.py"
 
 [tool.cibuildwheel]
 before-build = "python -m pip install -r requirements.txt -r mypy-requirements.txt"
-test-command = "python -m pytest -n 2 --pyargs schema_salad"
-test-requires = "-r test-requirements.txt black"
-skip = "pp* "
-# ^ skip building wheels on pypy
-test-skip = "cp*"
-# ^ tests skipped to save time
-#build-verbosity = "1"
+test-command = "python -m pytest -n 2 --junitxml=/output/test-results/junit_$(python -V | awk '{print $2}')_${AUDITWHEEL_PLAT}.xml --pyargs schema_salad"
+test-requires = "-r test-requirements.txt"
+test-extras = "pycodegen"
+skip = "pp* cp311-*"
+# ^ skip building wheels on PyPy (any version)
+#   and CPython 3.11 (mypyc doesn't support Python 3.11)
+build-verbosity = "1"
diff --git a/setup.py b/setup.py
index 447df085f..d34b6365d 100644
--- a/setup.py
+++ b/setup.py
@@ -125,11 +125,17 @@
             "metaschema/*",
             "py.typed",
             "dotnet/*",
+            "dotnet/*/*",
+            "dotnet/*/*/*",
             "java/*",
+            "java/*/*",
             "typescript/*",
+            "typescript/*/*",
+            "typescript/*/*/*",
             "typescript/.*",
         ],
         "schema_salad.tests": [
+            "*.json",
             "*.yml",
             "docimp/*",
             "*.owl",
@@ -137,6 +143,7 @@
             "*.txt",
             "foreign/*.cwl",
             "test_real_cwl/*",
+            "test_real_cwl/*/*",
             "test_schema/*",
         ],
     },