diff --git a/Makefile b/Makefile
index 0fe00e4..1dc4a4a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-dc = docker-compose --file features/support/docker-compose.yml --project-directory .
+dc = docker-compose --file features/test-runner/docker-compose.yml --project-directory .
 .PHONY: all clean test features serve docsite containers teardown
 
 # Default action is running all unit and acceptance tests
diff --git a/features/README.md b/features/README.md
index 8981e2d..85f60fa 100644
--- a/features/README.md
+++ b/features/README.md
@@ -9,4 +9,7 @@ In case you the reader are unfamiliar with [cucumber][1], these files
 are also runnable tests, with definitions in the `steps/` directory and
 additional support code in `support/`.
 
+Everything needed to set up the environment that actually runs the tests
+is in `test-runner/`.
+
 [1]: https://cucumber.io
diff --git a/features/support/Dockerfile b/features/test-runner/Dockerfile
similarity index 94%
rename from features/support/Dockerfile
rename to features/test-runner/Dockerfile
index 07897d2..dfd6872 100644
--- a/features/support/Dockerfile
+++ b/features/test-runner/Dockerfile
@@ -15,7 +15,7 @@ RUN useradd -d /tmp tester \
 #
 #     docker run --rm -v "$PWD":/usr/src/app -w /usr/src/app ruby:3.0 bundle install
 WORKDIR /usr/src/app
-COPY support/Gemfile support/Gemfile.lock ./
+COPY test-runner/Gemfile test-runner/Gemfile.lock ./
 RUN bundle install
 
 # After building dependencies, then copy in the code (which is much more
diff --git a/features/support/Gemfile b/features/test-runner/Gemfile
similarity index 100%
rename from features/support/Gemfile
rename to features/test-runner/Gemfile
diff --git a/features/support/Gemfile.lock b/features/test-runner/Gemfile.lock
similarity index 100%
rename from features/support/Gemfile.lock
rename to features/test-runner/Gemfile.lock
diff --git a/features/support/docker-compose.yml b/features/test-runner/docker-compose.yml
similarity index 94%
rename from features/support/docker-compose.yml
rename to features/test-runner/docker-compose.yml
index ff4094f..4a4e90a 100644
--- a/features/support/docker-compose.yml
+++ b/features/test-runner/docker-compose.yml
@@ -17,7 +17,7 @@ services:
   features:
     build:
       context: ./features
-      dockerfile: support/Dockerfile
+      dockerfile: test-runner/Dockerfile
     networks:
     - frontend
     depends_on: