diff --git a/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-result.txt b/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand-result.txt
similarity index 100%
rename from Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-result.txt
rename to Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand-result.txt
diff --git a/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-stderr.txt b/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand-stderr.txt
similarity index 61%
rename from Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-stderr.txt
rename to Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand-stderr.txt
index d819d150d..1f2c113c2 100644
--- a/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-stderr.txt
+++ b/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at NotAFeature_OriginDebug_target_compile_features.cmake:4 \(target_compile_features\):
+CMake Error at NotAFeature_OriginDebugCommand.cmake:4 \(target_compile_features\):
   target_compile_features specified unknown feature "not_a_feature" for
   target "somelib".
 Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features.cmake b/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand.cmake
similarity index 100%
rename from Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features.cmake
rename to Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand.cmake
diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
index 1892a5cf4..376f75a96 100644
--- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
@@ -6,7 +6,7 @@ run_cmake(NotAFeatureTransitive)
 run_cmake(NotAFeature_OriginDebug)
 run_cmake(NotAFeature_OriginDebugGenex)
 run_cmake(NotAFeature_OriginDebugTransitive)
-run_cmake(NotAFeature_OriginDebug_target_compile_features)
+run_cmake(NotAFeature_OriginDebugCommand)
 
 run_cmake(generate_feature_list)
 file(READ