diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb
index 3840f8a09a103e14a3d1ef2014dcd61cfb7c6408..5127fba07e13bab7e03db901d5f6f5d35526ff40 100644
--- a/auto/generate_test_runner.rb
+++ b/auto/generate_test_runner.rb
@@ -146,8 +146,9 @@ class UnityTestRunnerGenerator
 
   def find_mocks(includes)
     mock_headers = []
-    includes.each do |include_file|
-      mock_headers << File.basename(include_file) if (include_file =~ /^mock/i)
+    includes.each do |include_path|
+      include_file = File.basename(include_path)
+      mock_headers << include_path if (include_file =~ /^mock/i)
     end
     return mock_headers
   end
@@ -192,8 +193,8 @@ class UnityTestRunnerGenerator
     output.puts('')
   end
 
-  def create_mock_management(output, mocks)
-    unless (mocks.empty?)
+  def create_mock_management(output, mock_headers)
+    unless (mock_headers.empty?)
       output.puts("\n//=======Mock Management=====")
       output.puts("static void CMock_Init(void)")
       output.puts("{")
@@ -202,6 +203,10 @@ class UnityTestRunnerGenerator
         output.puts("  GlobalVerifyOrder = 0;")
         output.puts("  GlobalOrderError = NULL;")
       end
+      mocks = []
+      mock_headers.each do |mock|
+        mocks << File.basename(mock)
+      end
       mocks.each do |mock|
         mock_clean = TypeSanitizer.sanitize_c_identifier(mock)
         output.puts("  #{mock_clean}_Init();")