diff --git a/Tests/CustomCommand/CMakeLists.txt b/Tests/CustomCommand/CMakeLists.txt
index 97c4d812a..2fb4725da 100644
--- a/Tests/CustomCommand/CMakeLists.txt
+++ b/Tests/CustomCommand/CMakeLists.txt
@@ -131,22 +131,31 @@ ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/foo.c
   ${PROJECT_BINARY_DIR}/foo.c
   )
 
-# These object dependencies can be removed to test the
-# auto-object-depends feature of the Makefile generator.  Currently
-# the feature does not seem to work in Visual Studio generators so
-# these dependencies are needed.
-#SET_SOURCE_FILES_PROPERTIES(${PROJECT_BINARY_DIR}/foo.c 
-#PROPERTIES
-#  OBJECT_DEPENDS "${PROJECT_BINARY_DIR}/doc1.h;${PROJECT_BINARY_DIR}/foo.h"
-#)
+# Add custom command to generate not_included.h, which is a header
+# file that is not included by any source in this project.  This will
+# test whether all custom command outputs explicitly listed as sources
+# get generated even if they are not needed by an object file.
+ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/not_included.h
+  DEPENDS ${PROJECT_SOURCE_DIR}/foo.h.in
+  COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/foo.h.in
+                                   ${PROJECT_BINARY_DIR}/not_included.h
+  )
 
-# add the library
+# Tell the executable where to find not_included.h.
+CONFIGURE_FILE(
+  ${PROJECT_SOURCE_DIR}/config.h.in
+  ${PROJECT_BINARY_DIR}/config.h
+  @ONLY IMMEDIATE
+  )
+
+# add the executable
 ADD_EXECUTABLE(CustomCommand 
   ${PROJECT_BINARY_DIR}/foo.h
   ${PROJECT_BINARY_DIR}/foo.c
   ${PROJECT_BINARY_DIR}/wrapped.c
   ${PROJECT_BINARY_DIR}/wrapped_help.c
   ${PROJECT_BINARY_DIR}/generated.c
+  ${PROJECT_BINARY_DIR}/not_included.h
   )
 
 TARGET_LINK_LIBRARIES(CustomCommand GeneratedHeader)
diff --git a/Tests/CustomCommand/config.h.in b/Tests/CustomCommand/config.h.in
new file mode 100644
index 000000000..86c97bd95
--- /dev/null
+++ b/Tests/CustomCommand/config.h.in
@@ -0,0 +1 @@
+#define PROJECT_BINARY_DIR "@PROJECT_BINARY_DIR@"
diff --git a/Tests/CustomCommand/foo.in b/Tests/CustomCommand/foo.in
index 62b04b20b..08c559df4 100644
--- a/Tests/CustomCommand/foo.in
+++ b/Tests/CustomCommand/foo.in
@@ -1,5 +1,8 @@
 #include "doc1.h"
 #include "foo.h"
+#include "config.h"
+
+#include <stdio.h>
 
 int generated();
 int wrapped();
@@ -8,7 +11,16 @@ int main ()
 {
   if (generated()*wrapped()*doc() == 3*5*7)
     {
-    return 0;
+    FILE* fin = fopen(PROJECT_BINARY_DIR "/not_included.h", "r");
+    if(fin)
+      {
+      fclose(fin);
+      return 0;
+      }
+    else
+      {
+      return -2;
+      }
     }
   
   return -1;