diff --git a/.github/workflows/httpd-build.yml b/.github/workflows/httpd-build.yml
index 16f08582..5bd589a3 100644
--- a/.github/workflows/httpd-build.yml
+++ b/.github/workflows/httpd-build.yml
@@ -35,6 +35,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
       - name: Checkout httpd ${{ matrix.branch }}
         uses: actions/checkout@v4
         with:
@@ -57,7 +59,7 @@ jobs:
           cpanm --notest Net::SSL LWP::Protocol::https \
                          LWP::Protocol::AnyEvent::http ExtUtils::Embed Test::More \
                          AnyEvent DateTime HTTP::DAV FCGI \
-                         AnyEvent::WebSocket::Client Apache::Test
+                         AnyEvent::WebSocket::Client
 
       - name: Build httpd
         working-directory: httpd
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..7af4fbb4
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "Apache-Test"]
+	path = Apache-Test
+	url = https://github.com/apache/perl-apache-test
diff --git a/Apache-Test b/Apache-Test
new file mode 160000
index 00000000..ed33bc92
--- /dev/null
+++ b/Apache-Test
@@ -0,0 +1 @@
+Subproject commit ed33bc9265f494ae2fd099a7653da5aa6e173b4d
diff --git a/README.md b/README.md
index 13ae6508..1b6ccbf2 100644
--- a/README.md
+++ b/README.md
@@ -49,15 +49,19 @@ cpanm --quiet --showdeps  Bundle::ApacheTest|grep -v Crypt::SSLeay|xargs cpanm
 
 If you don't care how it works and just want to run the tests:
 
-1. You need an installation of Apache (2.4.x thru trunk).
-2. Any DSOs you wish to use should be configured in that Apache's
-   `httpd.conf` (the test harness will pick this configuration up).
-3. Setup:
+1. Clone this repository:
+   ```bash
+   git clone --recurse-submodule https://github.com/apache/httpd-tests
    ```
+2. You need an installation of Apache httpd (2.4.x or trunk).
+3. Any DSOs you wish to use should be configured in that Apache's
+   `httpd.conf` (the test harness will pick this configuration up).
+4. Setup:
+   ```bash
    perl Makefile.PL -apxs /path/to/apache/bin/apxs
    ```
-4. Run the tests:
-   ```
+5. Run the tests:
+   ```bash
    t/TEST
    ```
 5. Evaluate test output.