diff --git a/.gitmodules b/.gitmodules
index aaab57c1..2dd0d639 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,8 +2,8 @@
 	path = buildroot
 	url = ../buildroot.git
 [submodule "9pm"]
-	path = 9pm
+	path = test/9pm
 	url = ../9pm
 [submodule "qeneth"]
-	path = qeneth
+	path = test/qeneth
 	url = ../qeneth.git
diff --git a/board/x86_64/board.mk b/board/x86_64/board.mk
index 4356d6a1..e434bbf9 100644
--- a/board/x86_64/board.mk
+++ b/board/x86_64/board.mk
@@ -14,14 +14,14 @@ test-env-run    = $(call test-env,-C -t $(BINARIES_DIR)/qemu.dot,$(1))
 
 test-qeneth:
 	$(call test-env-qeneth,\
-		$(BR2_EXTERNAL_INFIX_PATH)/9pm/9pm.py \
+		$(BR2_EXTERNAL_INFIX_PATH)/test/9pm/9pm.py \
 			$(INFIX_TESTS))
 test-qeneth-sh:
 	$(call test-env-qeneth,/bin/sh)
 
 test-run: | ~/.infix-test-venv
 	$(call test-env-run,\
-		$(BR2_EXTERNAL_INFIX_PATH)/9pm/9pm.py \
+		$(BR2_EXTERNAL_INFIX_PATH)/test/9pm/9pm.py \
 			$(INFIX_TESTS))
 test-run-sh: | ~/.infix-test-venv
 	$(call test-env-run,/bin/sh)
diff --git a/9pm b/test/9pm
similarity index 100%
rename from 9pm
rename to test/9pm
diff --git a/test/env b/test/env
index 4031acb7..46812db9 100755
--- a/test/env
+++ b/test/env
@@ -40,7 +40,7 @@ start_topology()
     cat <<EOF >"$envdir/bin/qeneth"
 #!/bin/sh
 set -x
-cd $envdir/qeneth && exec $ixdir/qeneth/qeneth "\$@"
+cd $senvdir/qeneth && exec $testdir/qeneth/qeneth "\$@"
 EOF
     chmod +x "$envdir/bin/qeneth"
 }
@@ -93,7 +93,7 @@ testdir=$(dirname $(readlink -f "$0"))
 ixdir=$(readlink -f "$testdir/..")
 logdir=$(readlink -f "$testdir/.log")
 envdir="$HOME/.infix-test-venv"
-qeneth="$ixdir/qeneth/qeneth"
+qeneth="$testdir/qeneth/qeneth"
 
 # Global options
 containerize=yes
diff --git a/qeneth b/test/qeneth
similarity index 100%
rename from qeneth
rename to test/qeneth