diff --git a/.github/labeler.yml b/.github/labeler.yml
index 025ab952f1..4ae38c438c 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -157,7 +157,7 @@ HTTP:
 - all: ['lib/h2h3.*']
 - all: ['lib/http*']
 - all: ['tests/http-server.pl']
-- all: ['tests/tests-httpd/*']
+- all: ['tests/http/*']
 
 HTTP/2:
 - all: ['docs/HTTP2.md']
diff --git a/configure.ac b/configure.ac
index 4edc33e231..276c78474b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4654,8 +4654,8 @@ AC_CONFIG_FILES([Makefile \
            tests/server/Makefile \
            tests/libtest/Makefile \
            tests/unit/Makefile \
-           tests/tests-httpd/config.ini \
-           tests/tests-httpd/Makefile \
+           tests/http/config.ini \
+           tests/http/Makefile \
            packages/Makefile \
            packages/vms/Makefile \
            curl-config \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bc129326d0..51a26d1e6a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -48,7 +48,7 @@ BUILD_UNIT =
 DIST_UNIT = unit
 endif
 
-SUBDIRS = certs data server libtest tests-httpd $(BUILD_UNIT)
+SUBDIRS = certs data server libtest http $(BUILD_UNIT)
 DIST_SUBDIRS = $(SUBDIRS) $(DIST_UNIT)
 
 PERLFLAGS = -I$(srcdir)
diff --git a/tests/conftest.py b/tests/conftest.py
new file mode 100644
index 0000000000..3e0599c5f1
--- /dev/null
+++ b/tests/conftest.py
@@ -0,0 +1,48 @@
+#***************************************************************************
+#                                  _   _ ____  _
+#  Project                     ___| | | |  _ \| |
+#                             / __| | | | |_) | |
+#                            | (__| |_| |  _ <| |___
+#                             \___|\___/|_| \_\_____|
+#
+# Copyright (C) 2008 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
+#
+# This software is licensed as described in the file COPYING, which
+# you should have received as part of this distribution. The terms
+# are also available at https://curl.se/docs/copyright.html.
+#
+# You may opt to use, copy, modify, merge, publish, distribute and/or sell
+# copies of the Software, and permit persons to whom the Software is
+# furnished to do so, under the terms of the COPYING file.
+#
+# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+# KIND, either express or implied.
+#
+# SPDX-License-Identifier: curl
+#
+###########################################################################
+#
+import logging
+import os
+import sys
+from typing import Optional
+
+import pytest
+
+
+def pytest_report_header(config, startdir):
+    return f"curl tests"
+
+
+def pytest_addoption(parser):
+    parser.addoption("--repeat", action="store", type=int, default=1,
+                     help='Number of times to repeat each test')
+
+
+def pytest_generate_tests(metafunc):
+    if "repeat" in metafunc.fixturenames:
+        count = int(metafunc.config.getoption("repeat"))
+        metafunc.fixturenames.append('tmp_ct')
+        metafunc.parametrize('repeat', range(count))
+
+
diff --git a/tests/tests-httpd/.gitignore b/tests/http/.gitignore
similarity index 100%
rename from tests/tests-httpd/.gitignore
rename to tests/http/.gitignore
diff --git a/tests/tests-httpd/Makefile.am b/tests/http/Makefile.am
similarity index 100%
rename from tests/tests-httpd/Makefile.am
rename to tests/http/Makefile.am
diff --git a/tests/tests-httpd/README.md b/tests/http/README.md
similarity index 95%
rename from tests/tests-httpd/README.md
rename to tests/http/README.md
index cf02b50aaf..e7069d6223 100644
--- a/tests/tests-httpd/README.md
+++ b/tests/http/README.md
@@ -59,22 +59,22 @@ curl> pytest -k "test_02_06 and h2"
 Several test cases can be repeated, they all have the `repeat` parameter. To make this work, you have to start `pytest` in the test directory itself (for some unknown reason). Like in:
 
 ```
-curl/tests/tests-httpd> pytest -k "test_02_06 and h2" --repeat=100
+curl/tests/http> pytest -k "test_02_06 and h2" --repeat=100
 ```
 
 which then runs this test case a hundred times. In case of flaky tests, you can make pytest stop on the first one with:
 
 ```
-curl/tests/tests-httpd> pytest -k "test_02_06 and h2" --repeat=100 --maxfail=1
+curl/tests/http> pytest -k "test_02_06 and h2" --repeat=100 --maxfail=1
 ```
 
 which allow you to inspect output and log files for the failed run. Speaking of log files, the verbosity of pytest is also used to collect curl trace output. If you specify `-v` three times, the `curl` command is started with `--trace`:
 
 ```
-curl/tests/tests-httpd> pytest -vvv -k "test_02_06 and h2" --repeat=100 --maxfail=1
+curl/tests/http> pytest -vvv -k "test_02_06 and h2" --repeat=100 --maxfail=1
 ```
 
-all of curl's output and trace file are found in `tests/tests-httpd/gen/curl`.
+all of curl's output and trace file are found in `tests/http/gen/curl`.
 
 ## Writing Tests
 
diff --git a/tests/tests-httpd/config.ini.in b/tests/http/config.ini.in
similarity index 100%
rename from tests/tests-httpd/config.ini.in
rename to tests/http/config.ini.in
diff --git a/tests/tests-httpd/conftest.py b/tests/http/conftest.py
similarity index 81%
rename from tests/tests-httpd/conftest.py
rename to tests/http/conftest.py
index 3679eabbb7..903c6c87b1 100644
--- a/tests/tests-httpd/conftest.py
+++ b/tests/http/conftest.py
@@ -35,19 +35,7 @@ from testenv import Env, Nghttpx, Httpd
 
 
 def pytest_report_header(config, startdir):
-    return f"curl tests-httpd tests"
-
-
-def pytest_addoption(parser):
-    parser.addoption("--repeat", action="store", type=int, default=1,
-                     help='Number of times to repeat each test')
-
-
-def pytest_generate_tests(metafunc):
-    if "repeat" in metafunc.fixturenames:
-        count = int(metafunc.config.getoption("repeat"))
-        metafunc.fixturenames.append('tmp_ct')
-        metafunc.parametrize('repeat', range(count))
+    return f"curl http tests"
 
 
 @pytest.fixture(scope="package")
diff --git a/tests/tests-httpd/scorecard.py b/tests/http/scorecard.py
similarity index 100%
rename from tests/tests-httpd/scorecard.py
rename to tests/http/scorecard.py
diff --git a/tests/tests-httpd/test_01_basic.py b/tests/http/test_01_basic.py
similarity index 100%
rename from tests/tests-httpd/test_01_basic.py
rename to tests/http/test_01_basic.py
diff --git a/tests/tests-httpd/test_02_download.py b/tests/http/test_02_download.py
similarity index 100%
rename from tests/tests-httpd/test_02_download.py
rename to tests/http/test_02_download.py
diff --git a/tests/tests-httpd/test_03_goaway.py b/tests/http/test_03_goaway.py
similarity index 100%
rename from tests/tests-httpd/test_03_goaway.py
rename to tests/http/test_03_goaway.py
diff --git a/tests/tests-httpd/test_04_stuttered.py b/tests/http/test_04_stuttered.py
similarity index 100%
rename from tests/tests-httpd/test_04_stuttered.py
rename to tests/http/test_04_stuttered.py
diff --git a/tests/tests-httpd/test_05_errors.py b/tests/http/test_05_errors.py
similarity index 100%
rename from tests/tests-httpd/test_05_errors.py
rename to tests/http/test_05_errors.py
diff --git a/tests/tests-httpd/test_06_eyeballs.py b/tests/http/test_06_eyeballs.py
similarity index 100%
rename from tests/tests-httpd/test_06_eyeballs.py
rename to tests/http/test_06_eyeballs.py
diff --git a/tests/tests-httpd/test_07_upload.py b/tests/http/test_07_upload.py
similarity index 100%
rename from tests/tests-httpd/test_07_upload.py
rename to tests/http/test_07_upload.py
diff --git a/tests/tests-httpd/test_08_caddy.py b/tests/http/test_08_caddy.py
similarity index 100%
rename from tests/tests-httpd/test_08_caddy.py
rename to tests/http/test_08_caddy.py
diff --git a/tests/tests-httpd/test_09_push.py b/tests/http/test_09_push.py
similarity index 100%
rename from tests/tests-httpd/test_09_push.py
rename to tests/http/test_09_push.py
diff --git a/tests/tests-httpd/test_10_proxy.py b/tests/http/test_10_proxy.py
similarity index 100%
rename from tests/tests-httpd/test_10_proxy.py
rename to tests/http/test_10_proxy.py
diff --git a/tests/tests-httpd/test_11_unix.py b/tests/http/test_11_unix.py
similarity index 100%
rename from tests/tests-httpd/test_11_unix.py
rename to tests/http/test_11_unix.py
diff --git a/tests/tests-httpd/testenv/__init__.py b/tests/http/testenv/__init__.py
similarity index 100%
rename from tests/tests-httpd/testenv/__init__.py
rename to tests/http/testenv/__init__.py
diff --git a/tests/tests-httpd/testenv/caddy.py b/tests/http/testenv/caddy.py
similarity index 100%
rename from tests/tests-httpd/testenv/caddy.py
rename to tests/http/testenv/caddy.py
diff --git a/tests/tests-httpd/testenv/certs.py b/tests/http/testenv/certs.py
similarity index 100%
rename from tests/tests-httpd/testenv/certs.py
rename to tests/http/testenv/certs.py
diff --git a/tests/tests-httpd/testenv/curl.py b/tests/http/testenv/curl.py
similarity index 100%
rename from tests/tests-httpd/testenv/curl.py
rename to tests/http/testenv/curl.py
diff --git a/tests/tests-httpd/testenv/env.py b/tests/http/testenv/env.py
similarity index 99%
rename from tests/tests-httpd/testenv/env.py
rename to tests/http/testenv/env.py
index f468043dd8..8389119a7d 100644
--- a/tests/tests-httpd/testenv/env.py
+++ b/tests/http/testenv/env.py
@@ -112,7 +112,7 @@ class EnvConfig:
             'cert': 'xxx',
         }
         self.htdocs_dir = os.path.join(self.gen_dir, 'htdocs')
-        self.tld = 'tests-httpd.curl.se'
+        self.tld = 'http.curl.se'
         self.domain1 = f"one.{self.tld}"
         self.domain2 = f"two.{self.tld}"
         self.proxy_domain = f"proxy.{self.tld}"
diff --git a/tests/tests-httpd/testenv/httpd.py b/tests/http/testenv/httpd.py
similarity index 100%
rename from tests/tests-httpd/testenv/httpd.py
rename to tests/http/testenv/httpd.py
diff --git a/tests/tests-httpd/testenv/mod_curltest/.gitignore b/tests/http/testenv/mod_curltest/.gitignore
similarity index 100%
rename from tests/tests-httpd/testenv/mod_curltest/.gitignore
rename to tests/http/testenv/mod_curltest/.gitignore
diff --git a/tests/tests-httpd/testenv/mod_curltest/mod_curltest.c b/tests/http/testenv/mod_curltest/mod_curltest.c
similarity index 100%
rename from tests/tests-httpd/testenv/mod_curltest/mod_curltest.c
rename to tests/http/testenv/mod_curltest/mod_curltest.c
diff --git a/tests/tests-httpd/testenv/nghttpx.py b/tests/http/testenv/nghttpx.py
similarity index 100%
rename from tests/tests-httpd/testenv/nghttpx.py
rename to tests/http/testenv/nghttpx.py