diff --git a/repos/libports/src/test/libc_ffat/target.mk b/repos/libports/src/test/libc_ffat/target.mk
index 3b2a9e960..9b3256b63 100644
--- a/repos/libports/src/test/libc_ffat/target.mk
+++ b/repos/libports/src/test/libc_ffat/target.mk
@@ -1,3 +1,6 @@
 TARGET = test-libc_ffat
 LIBS   = libc libc_ffat
 SRC_CC = main.cc
+
+# we re-use the libc_vfs test
+vpath main.cc $(REP_DIR)/src/test/libc_vfs
diff --git a/repos/libports/src/test/libc_fuse_exfat/target.mk b/repos/libports/src/test/libc_fuse_exfat/target.mk
index 2588fe243..084b420c7 100644
--- a/repos/libports/src/test/libc_fuse_exfat/target.mk
+++ b/repos/libports/src/test/libc_fuse_exfat/target.mk
@@ -2,4 +2,4 @@ TARGET   = test-libc_fuse_exfat
 LIBS     = libc libc_fuse_exfat
 SRC_CC   = main.cc
 
-vpath %.cc $(PRG_DIR)/../libc_ffat/
+vpath %.cc $(REP_DIR)/src/test/libc_vfs
diff --git a/repos/libports/src/test/libc_fuse_ext2/target.mk b/repos/libports/src/test/libc_fuse_ext2/target.mk
index 08ade3c36..4a709a205 100644
--- a/repos/libports/src/test/libc_fuse_ext2/target.mk
+++ b/repos/libports/src/test/libc_fuse_ext2/target.mk
@@ -2,4 +2,4 @@ TARGET   = test-libc_fuse_ext2
 LIBS     = libc libc_fuse_ext2
 SRC_CC   = main.cc
 
-vpath %.cc $(PRG_DIR)/../libc_ffat
+vpath %.cc $(REP_DIR)/src/test/libc_vfs
diff --git a/repos/libports/src/test/libc_fuse_ntfs-3g/target.mk b/repos/libports/src/test/libc_fuse_ntfs-3g/target.mk
index e1e843b2c..47bb1e50d 100644
--- a/repos/libports/src/test/libc_fuse_ntfs-3g/target.mk
+++ b/repos/libports/src/test/libc_fuse_ntfs-3g/target.mk
@@ -2,4 +2,4 @@ TARGET   = test-libc_fuse_ntfs-3g
 LIBS     = libc libc_fuse_ntfs-3g
 SRC_CC   = main.cc
 
-vpath %.cc $(PRG_DIR)/../libc_ffat
+vpath %.cc $(REP_DIR)/src/test/libc_vfs
diff --git a/repos/libports/src/test/libc_ffat/main.cc b/repos/libports/src/test/libc_vfs/main.cc
similarity index 99%
rename from repos/libports/src/test/libc_ffat/main.cc
rename to repos/libports/src/test/libc_vfs/main.cc
index 5fb7a2649..85798979c 100644
--- a/repos/libports/src/test/libc_ffat/main.cc
+++ b/repos/libports/src/test/libc_vfs/main.cc
@@ -1,5 +1,5 @@
 /*
- * \brief  libc_ffat test
+ * \brief  Libc file-system test
  * \author Christian Prochaska
  * \author Norman Feske
  * \date   2011-05-27
diff --git a/repos/libports/src/test/libc_vfs/target.mk b/repos/libports/src/test/libc_vfs/target.mk
index c49e6ca3c..f654d2824 100644
--- a/repos/libports/src/test/libc_vfs/target.mk
+++ b/repos/libports/src/test/libc_vfs/target.mk
@@ -1,6 +1,3 @@
 TARGET = test-libc_vfs
 LIBS   = libc
 SRC_CC = main.cc
-
-# we re-use the libc_ffat test
-vpath main.cc $(REP_DIR)/src/test/libc_ffat
diff --git a/repos/ports/src/test/libc_noux/target.mk b/repos/ports/src/test/libc_noux/target.mk
index a707af66d..ce9f5a804 100644
--- a/repos/ports/src/test/libc_noux/target.mk
+++ b/repos/ports/src/test/libc_noux/target.mk
@@ -2,5 +2,5 @@ TARGET = test-libc_noux
 LIBS   = libc libc_noux
 SRC_CC = main.cc
 
-# we re-use the libc_ffat test
-vpath main.cc $(call select_from_repositories,src/test/libc_ffat)
+# we re-use the libc_vfs test
+vpath main.cc $(call select_from_repositories,src/test/libc_vfs)