diff --git a/pyproject.toml b/pyproject.toml
index ada2cf0..d8a081d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,6 +6,6 @@ build-backend = "setuptools.build_meta"
 minversion = "6.0"
 addopts = ""
 testpaths = [
-    "tests_new",
+    "tests",
 ]
 
diff --git a/setup.cfg b/setup.cfg
index e65917a..88d8f22 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -28,7 +28,7 @@ classifiers =
 zip_safe = false
 include_package_data = true
 python_requires = >= 3.6
-test_suite = tests_new
+test_suite = tests
 install_requires =
 # deprecated/redundant with pyproject.toml, but lets keep both ways around for now
 setup_requires =
diff --git a/tests/__init__.py b/tests/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/tests_new/conftest.py b/tests/conftest.py
similarity index 100%
rename from tests_new/conftest.py
rename to tests/conftest.py
diff --git a/tests_new/constants.py b/tests/constants.py
similarity index 100%
rename from tests_new/constants.py
rename to tests/constants.py
diff --git a/tests_new/data/README.md b/tests/data/README.md
similarity index 100%
rename from tests_new/data/README.md
rename to tests/data/README.md
diff --git a/tests_new/data/alice@openpgp.example.pub.asc b/tests/data/alice@openpgp.example.pub.asc
similarity index 100%
rename from tests_new/data/alice@openpgp.example.pub.asc
rename to tests/data/alice@openpgp.example.pub.asc
diff --git a/tests_new/data/alice@openpgp.example.sec.asc b/tests/data/alice@openpgp.example.sec.asc
similarity index 100%
rename from tests_new/data/alice@openpgp.example.sec.asc
rename to tests/data/alice@openpgp.example.sec.asc
diff --git a/tests_new/data/bob@openpgp.example.pub.asc b/tests/data/bob@openpgp.example.pub.asc
similarity index 100%
rename from tests_new/data/bob@openpgp.example.pub.asc
rename to tests/data/bob@openpgp.example.pub.asc
diff --git a/tests_new/data/bob@openpgp.example.sec.asc b/tests/data/bob@openpgp.example.sec.asc
similarity index 100%
rename from tests_new/data/bob@openpgp.example.sec.asc
rename to tests/data/bob@openpgp.example.sec.asc
diff --git a/tests_new/test_identity.py b/tests/test_identity.py
similarity index 100%
rename from tests_new/test_identity.py
rename to tests/test_identity.py
diff --git a/tests_new/test_message.py b/tests/test_message.py
similarity index 100%
rename from tests_new/test_message.py
rename to tests/test_message.py
diff --git a/tests_new/test_pep.py b/tests/test_pep.py
similarity index 100%
rename from tests_new/test_pep.py
rename to tests/test_pep.py