diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aa0f3a74d3e3da1d6a4e5e2b264000476fd5960c..6c9f04bdf48bd6280f3c82f71614826d2474c7e9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
         -   name: "Main Script"
             run: |
                 curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-flake8.sh
-                . ./prepare-and-run-flake8.sh "$(basename $GITHUB_REPOSITORY)" ./test
+                . ./prepare-and-run-flake8.sh "$(basename $GITHUB_REPOSITORY)"
 
     validate_cff:
         name: Validate CITATION.cff
@@ -48,7 +48,7 @@ jobs:
             run: |
                 EXTRA_INSTALL="numpy pymbolic"
                 curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-pylint.sh
-                . ./prepare-and-run-pylint.sh "$(basename $GITHUB_REPOSITORY)" test/test_*.py
+                . ./prepare-and-run-pylint.sh "$(basename $GITHUB_REPOSITORY)"
 
     mypy:
         name: Mypy
@@ -82,9 +82,6 @@ jobs:
                 # untested, causes import error with Pytest >= 6.2.0
                 # AK, 2020-12-13
                 rm pytools/mpiwrap.py
-                # just a forwarding shim, causes import error with Pytest >= 6.2.0
-                # AK, 2020-12-13
-                rm pytools/log.py
 
                 EXTRA_INSTALL="numpy"
                 curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh
@@ -101,7 +98,7 @@ jobs:
                 python-version: '3.x'
         -   name: "Main Script"
             run: |
-                NO_DOCTESTS=1
+                rm pytools/{convergence,spatial_btree,obj_array,mpiwrap}.py
                 curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh
                 . ./build-and-test-py-project.sh
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0667d5c4a2c4edc79c75fb94b4b77002351cdceb..accae2880950df25286dd89843bb4d24245cfaa9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,9 +3,6 @@ Pytest:
     # untested, causes import error with Pytest >= 6.2.0
     # AK, 2020-12-13
     rm pytools/mpiwrap.py
-    # just a forwarding shim, causes import error with Pytest >= 6.2.0
-    # AK, 2020-12-13
-    rm pytools/log.py
 
     export EXTRA_INSTALL="numpy"
     curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh
@@ -20,7 +17,7 @@ Pytest:
 
 Pytest without Numpy:
   script: |
-    NO_DOCTESTS=1
+    rm pytools/{convergence,spatial_btree,obj_array,mpiwrap}.py
     curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh
     . ./build-and-test-py-project.sh
   tags:
@@ -46,7 +43,7 @@ Pytest without Numpy:
 Flake8:
   script:
   - curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-flake8.sh
-  - . ./prepare-and-run-flake8.sh "$CI_PROJECT_NAME" test
+  - . ./prepare-and-run-flake8.sh "$CI_PROJECT_NAME"
   tags:
   - python3
   except:
@@ -66,7 +63,7 @@ Pylint:
   - EXTRA_INSTALL="numpy pymbolic"
   - py_version=3
   - curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-pylint.sh
-  - . ./prepare-and-run-pylint.sh "$CI_PROJECT_NAME" test/test_*.py
+  - . ./prepare-and-run-pylint.sh "$CI_PROJECT_NAME"
   tags:
   - python3
   except:
diff --git a/pytools/log.py b/pytools/log.py
deleted file mode 100644
index ad45bab016b424ce4e9393a74f522844cc351594..0000000000000000000000000000000000000000
--- a/pytools/log.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from warnings import warn
-
-
-warn("pytools.log was moved to https://github.com/illinois-ceesd/logpyle/. "
-        "I will try to import that for you. If the import fails, say "
-        "'pip install logpyle', and change your imports from 'pytools.log' "
-        "to 'logpyle'.", DeprecationWarning)
-
-from logpyle import *  # noqa  # pylint: disable=import-error
diff --git a/test/test_data_table.py b/pytools/test/test_data_table.py
similarity index 100%
rename from test/test_data_table.py
rename to pytools/test/test_data_table.py
diff --git a/test/test_graph_tools.py b/pytools/test/test_graph_tools.py
similarity index 100%
rename from test/test_graph_tools.py
rename to pytools/test/test_graph_tools.py
diff --git a/test/test_math_stuff.py b/pytools/test/test_math_stuff.py
similarity index 100%
rename from test/test_math_stuff.py
rename to pytools/test/test_math_stuff.py
diff --git a/test/test_mpi.py b/pytools/test/test_mpi.py
similarity index 100%
rename from test/test_mpi.py
rename to pytools/test/test_mpi.py
diff --git a/test/test_persistent_dict.py b/pytools/test/test_persistent_dict.py
similarity index 100%
rename from test/test_persistent_dict.py
rename to pytools/test/test_persistent_dict.py
diff --git a/test/test_py_codegen.py b/pytools/test/test_py_codegen.py
similarity index 100%
rename from test/test_py_codegen.py
rename to pytools/test/test_py_codegen.py
diff --git a/test/test_pytools.py b/pytools/test/test_pytools.py
similarity index 100%
rename from test/test_pytools.py
rename to pytools/test/test_pytools.py