diff --git a/test/src/cfile/test_cfile.cpp b/test/src/cfile/test_cfile.cpp
new file mode 100644
index 00000000000..59acaaec101
--- /dev/null
+++ b/test/src/cfile/test_cfile.cpp
@@ -0,0 +1,29 @@
+
+#include <gtest/gtest.h>
+
+#include <cfile/cfile.h>
+
+#include "util/FSTestFixture.h"
+
+class CFileTest : public test::FSTestFixture {
+ public:
+	CFileTest() : test::FSTestFixture(0) {
+		pushModDir("cfile");
+	}
+};
+
+TEST_F(CFileTest, temp_subdir) {
+	ASSERT_FALSE(cf_exists_full("test_001.dds", CF_TYPE_ANY));
+
+	ASSERT_TRUE(cf_set_temp_subdir_pathtype("test.eff"));
+
+	ASSERT_TRUE(cf_exists_full("test_001.dds", CF_TYPE_ANY));
+}
+
+TEST_F(CFileTest, temp_subdir_vps) {
+	ASSERT_FALSE(cf_exists_full("test_001.dds", CF_TYPE_ANY));
+
+	ASSERT_TRUE(cf_set_temp_subdir_pathtype("test.eff"));
+
+	ASSERT_TRUE(cf_exists_full("test_001.dds", CF_TYPE_ANY));
+}
diff --git a/test/src/source_groups.cmake b/test/src/source_groups.cmake
index 94acd6b3b94..cb0a0001c2c 100644
--- a/test/src/source_groups.cmake
+++ b/test/src/source_groups.cmake
@@ -12,6 +12,10 @@ add_file_folder(root ""
     test_stubs.cpp
 )
 
+add_file_folder(graphics "CFile"
+        cfile/test_cfile.cpp
+)
+
 add_file_folder(graphics "Globalincs"
     globalincs/test_flagset.cpp
     globalincs/test_safe_strings.cpp
diff --git a/test/test_data/cfile/temp_subdir/data/effects/test.eff b/test/test_data/cfile/temp_subdir/data/effects/test.eff
new file mode 100644
index 00000000000..3acac5613dd
--- /dev/null
+++ b/test/test_data/cfile/temp_subdir/data/effects/test.eff
@@ -0,0 +1 @@
+Dummy file
\ No newline at end of file
diff --git a/test/test_data/cfile/temp_subdir/data/effects/test/test_001.dds b/test/test_data/cfile/temp_subdir/data/effects/test/test_001.dds
new file mode 100644
index 00000000000..f4dbe63934c
--- /dev/null
+++ b/test/test_data/cfile/temp_subdir/data/effects/test/test_001.dds
@@ -0,0 +1 @@
+dummy content
\ No newline at end of file
diff --git a/test/test_data/cfile/temp_subdir_vps/test.vp b/test/test_data/cfile/temp_subdir_vps/test.vp
new file mode 100644
index 00000000000..07a729c48c9
Binary files /dev/null and b/test/test_data/cfile/temp_subdir_vps/test.vp differ