diff --git a/project/pc-x86-64-test.mk b/project/pc-x86-64-test.mk
index 83b82514..e3a31e93 100644
--- a/project/pc-x86-64-test.mk
+++ b/project/pc-x86-64-test.mk
@@ -4,4 +4,6 @@ ARCH := x86
 SUBARCH := x86-64
 
 include project/target/pc.mk
+include project/virtual/fs.mk
+include project/virtual/minip.mk
 include project/virtual/test.mk
diff --git a/project/pc-x86-legacy-test.mk b/project/pc-x86-legacy-test.mk
index 884ebac5..cab58cf9 100644
--- a/project/pc-x86-legacy-test.mk
+++ b/project/pc-x86-legacy-test.mk
@@ -1,6 +1,8 @@
 # top level project rules for the pc-x86-legacy-test project
 #
 ARCH := x86
+CPU ?= legacy
 
-include project/target/pc-legacy.mk
+include project/target/pc.mk
+include project/virtual/fs.mk
 include project/virtual/test.mk
diff --git a/project/pc-x86-test.mk b/project/pc-x86-test.mk
index 5adde985..3f22d6bf 100644
--- a/project/pc-x86-test.mk
+++ b/project/pc-x86-test.mk
@@ -4,4 +4,6 @@ ARCH := x86
 SUBARCH := x86-32
 
 include project/target/pc.mk
+include project/virtual/fs.mk
+include project/virtual/minip.mk
 include project/virtual/test.mk
diff --git a/project/target/pc-legacy.mk b/project/target/pc-legacy.mk
deleted file mode 100644
index 82f103da..00000000
--- a/project/target/pc-legacy.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# top level project rules for the pc virtual project
-#
-ARCH ?= x86
-SUBARCH ?= x86-32
-TARGET := pc-x86
-
-CPU ?= legacy
-
-MODULES += \
-	app/shell