diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb
index af3b98ae..8fbb4e9b 100755
--- a/auto/generate_test_runner.rb
+++ b/auto/generate_test_runner.rb
@@ -117,7 +117,7 @@ def generate(input_file, output_file, tests, used_mocks, testfile_includes)
     return unless @options[:header_file] && !@options[:header_file].empty?
 
     File.open(@options[:header_file], 'w') do |output|
-      create_h_file(output, @options[:header_file], tests, headers, used_mocks)
+      create_h_file(output, @options[:header_file], tests, testfile_includes, used_mocks)
     end
   end
 
diff --git a/test/tests/test_generate_test_runner.rb b/test/tests/test_generate_test_runner.rb
index 9a7f21e3..f1489b25 100644
--- a/test/tests/test_generate_test_runner.rb
+++ b/test/tests/test_generate_test_runner.rb
@@ -350,6 +350,27 @@
     }
   },
 
+  { :name => 'HeaderFile',
+    :testfile => 'testdata/testRunnerGenerator.c',
+    :testdefines => ['TEST'],
+    :options => {
+      :header_file => "build/testsample_HeaderFile_runner.h",
+    },
+    :expected => {
+      :to_pass => [ 'test_ThisTestAlwaysPasses',
+                    'spec_ThisTestPassesWhenNormalSetupRan',
+                    'spec_ThisTestPassesWhenNormalTeardownRan',
+                    'test_NotBeConfusedByLongComplicatedStrings',
+                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
+                    'test_StillNotBeConfusedByLongComplicatedStrings',
+                    'should_RunTestsStartingWithShouldByDefault',
+                    'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
+                  ],
+      :to_fail => [ 'test_ThisTestAlwaysFails' ],
+      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
+    }
+  },
+
 
   { :name => 'EmptyFileWarning',
     :testfile => 'testdata/testRunnerGeneratorEmpty.c',