diff --git a/.gitignore b/.gitignore
index a1168d57..0e2459d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@ prepare-vms/ips.pdf
 prepare-vms/settings.yaml
 prepare-vms/tags
 slides/*.yml.html
-slides/state.yaml
+slides/autopilot/state.yaml
diff --git a/README.md b/README.md
index 79b5c754..59eeb0d2 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ because they have a few things in common:
   (and updated) identically between different decks;
 - a [build system](slides/) generating HTML slides from
   Markdown source files;
-- a [semi-automated test harness](slides/autotest.py) to check
+- a [semi-automated test harness](slides/autopilot/) to check
   that the exercises and examples provided work properly;
 - a [PhantomJS script](slides/slidechecker.js) to check
   that the slides look good and don't have formatting issues;
diff --git a/slides/autotest.py b/slides/autopilot/autotest.py
similarity index 100%
rename from slides/autotest.py
rename to slides/autopilot/autotest.py