diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1079888c..9ff45c49 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
         -   name: "Main Script"
             run: |
                 curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-flake8.sh
-                . ./prepare-and-run-flake8.sh ./pudb ./test
+                . ./prepare-and-run-flake8.sh ./pudb
 
     pylint:
         name: Pylint
@@ -37,7 +37,7 @@ jobs:
         -   name: "Main Script"
             run: |
                 curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-pylint.sh
-                . ./prepare-and-run-pylint.sh "$(basename $GITHUB_REPOSITORY)" test/test_*.py
+                . ./prepare-and-run-pylint.sh "$(basename $GITHUB_REPOSITORY)"
 
     pytest:
         name: Pytest on Py${{ matrix.python-version }}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 77eecd4f..56f9f759 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ Python 3:
 Flake8:
   script:
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-flake8.sh
-  - ". ./prepare-and-run-flake8.sh pudb test"
+  - ". ./prepare-and-run-flake8.sh pudb"
   tags:
   - python3
   except:
@@ -35,7 +35,7 @@ Pylint:
   script: |
     export PY_EXE=python3
     curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/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/test/__init__.py b/pudb/test/__init__.py
similarity index 100%
rename from test/__init__.py
rename to pudb/test/__init__.py
diff --git a/test/test_lowlevel.py b/pudb/test/test_lowlevel.py
similarity index 100%
rename from test/test_lowlevel.py
rename to pudb/test/test_lowlevel.py
diff --git a/test/test_make_canvas.py b/pudb/test/test_make_canvas.py
similarity index 100%
rename from test/test_make_canvas.py
rename to pudb/test/test_make_canvas.py
diff --git a/test/test_run.py b/pudb/test/test_run.py
similarity index 100%
rename from test/test_run.py
rename to pudb/test/test_run.py
diff --git a/test/test_settings.py b/pudb/test/test_settings.py
similarity index 100%
rename from test/test_settings.py
rename to pudb/test/test_settings.py
diff --git a/test/test_source_code_providers.py b/pudb/test/test_source_code_providers.py
similarity index 100%
rename from test/test_source_code_providers.py
rename to pudb/test/test_source_code_providers.py
diff --git a/test/test_var_view.py b/pudb/test/test_var_view.py
similarity index 100%
rename from test/test_var_view.py
rename to pudb/test/test_var_view.py
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 00000000..c8db85d7
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,6 @@
+[tool.pytest.ini_options]
+
+addopts = [
+        "--ignore=pudb/b.py",
+        "--ignore=pudb/ipython.py.py",
+        ]