diff --git a/Makefile b/Makefile
index 337b4ad91..6b22e740c 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ moby-initrd.img: bin/moby moby.yaml
 
 moby-bzImage: moby-initrd.img
 
-test-initrd.img: bin/moby test.yaml
+test-initrd.img: bin/moby test/test.yaml
 	$^
 
 test-bzImage: test-initrd.img
@@ -55,7 +55,7 @@ else
 	touch $@
 endif
 
-.PHONY: hyperkit hyperkit-test
+.PHONY: hyperkit
 hyperkit: scripts/hyperkit.sh bin/com.docker.hyperkit bin/vpnkit moby-initrd.img moby-bzImage moby.yaml
 	./scripts/hyperkit.sh moby
 
@@ -63,6 +63,7 @@ define check_test_log
 	@cat $1 |grep -q 'Moby test suite PASSED'
 endef
 
+.PHONY: hyperkit-test
 hyperkit-test: scripts/hyperkit.sh bin/com.docker.hyperkit bin/vpnkit test-initrd.img test-bzImage test-cmdline
 	rm -f disk.img
 	script -q /dev/null ./scripts/hyperkit.sh test | tee test.log
diff --git a/tools/check/Dockerfile b/test/check/Dockerfile
similarity index 100%
rename from tools/check/Dockerfile
rename to test/check/Dockerfile
diff --git a/tools/check/Makefile b/test/check/Makefile
similarity index 100%
rename from tools/check/Makefile
rename to test/check/Makefile
diff --git a/tools/check/check-kernel-config.sh b/test/check/check-kernel-config.sh
similarity index 100%
rename from tools/check/check-kernel-config.sh
rename to test/check/check-kernel-config.sh
diff --git a/tools/check/check.sh b/test/check/check.sh
similarity index 100%
rename from tools/check/check.sh
rename to test/check/check.sh
diff --git a/tools/check/etc/moby b/test/check/etc/moby
similarity index 100%
rename from tools/check/etc/moby
rename to test/check/etc/moby
diff --git a/tools/test-ltp/.gitignore b/test/test-ltp/.gitignore
similarity index 100%
rename from tools/test-ltp/.gitignore
rename to test/test-ltp/.gitignore
diff --git a/tools/test-ltp/Dockerfile.build b/test/test-ltp/Dockerfile.build
similarity index 100%
rename from tools/test-ltp/Dockerfile.build
rename to test/test-ltp/Dockerfile.build
diff --git a/tools/test-ltp/Dockerfile.pkg b/test/test-ltp/Dockerfile.pkg
similarity index 100%
rename from tools/test-ltp/Dockerfile.pkg
rename to test/test-ltp/Dockerfile.pkg
diff --git a/tools/test-ltp/Makefile b/test/test-ltp/Makefile
similarity index 100%
rename from tools/test-ltp/Makefile
rename to test/test-ltp/Makefile
diff --git a/tools/test-ltp/README.md b/test/test-ltp/README.md
similarity index 100%
rename from tools/test-ltp/README.md
rename to test/test-ltp/README.md
diff --git a/tools/test-ltp/test-ltp.yaml b/test/test-ltp/test-ltp.yaml
similarity index 100%
rename from tools/test-ltp/test-ltp.yaml
rename to test/test-ltp/test-ltp.yaml
diff --git a/test.yaml b/test/test.yaml
similarity index 89%
rename from test.yaml
rename to test/test.yaml
index 6c943e8b2..075ad2c6f 100644
--- a/test.yaml
+++ b/test/test.yaml
@@ -15,9 +15,6 @@ system:
     capabilities:
      - CAP_SYS_BOOT
     read_only: true
-files:
-  - path: etc/docker/daemon.json
-    contents: '{"debug": true}'
 outputs:
   - format: kernel+initrd
   - format: iso-bios