diff --git a/minidump/minidump.gyp b/minidump/minidump.gyp
index 86be29cb..7874f8ae 100644
--- a/minidump/minidump.gyp
+++ b/minidump/minidump.gyp
@@ -76,6 +76,8 @@
         'minidump_context_writer_test.cc',
         'minidump_exception_writer_test.cc',
         'minidump_file_writer_test.cc',
+        'minidump_file_writer_test_util.cc',
+        'minidump_file_writer_test_util.h',
         'minidump_memory_writer_test.cc',
         'minidump_memory_writer_test_util.cc',
         'minidump_memory_writer_test_util.h',
@@ -83,8 +85,6 @@
         'minidump_module_writer_test.cc',
         'minidump_string_writer_test.cc',
         'minidump_system_info_writer_test.cc',
-        'minidump_test_util.cc',
-        'minidump_test_util.h',
         'minidump_thread_writer_test.cc',
         'minidump_writable_test.cc',
       ],
diff --git a/minidump/minidump_exception_writer_test.cc b/minidump/minidump_exception_writer_test.cc
index 6c289650..7256d2a4 100644
--- a/minidump/minidump_exception_writer_test.cc
+++ b/minidump/minidump_exception_writer_test.cc
@@ -26,7 +26,7 @@
 #include "minidump/minidump_context_writer.h"
 #include "minidump/minidump_extensions.h"
 #include "minidump/minidump_file_writer.h"
-#include "minidump/minidump_test_util.h"
+#include "minidump/minidump_file_writer_test_util.h"
 #include "util/file/string_file_writer.h"
 
 namespace crashpad {
diff --git a/minidump/minidump_file_writer_test.cc b/minidump/minidump_file_writer_test.cc
index 026cb8a0..c05e65e6 100644
--- a/minidump/minidump_file_writer_test.cc
+++ b/minidump/minidump_file_writer_test.cc
@@ -20,8 +20,8 @@
 
 #include "base/basictypes.h"
 #include "gtest/gtest.h"
+#include "minidump/minidump_file_writer_test_util.h"
 #include "minidump/minidump_stream_writer.h"
-#include "minidump/minidump_test_util.h"
 #include "minidump/minidump_writable.h"
 #include "util/file/file_writer.h"
 #include "util/file/string_file_writer.h"
diff --git a/minidump/minidump_test_util.cc b/minidump/minidump_file_writer_test_util.cc
similarity index 96%
rename from minidump/minidump_test_util.cc
rename to minidump/minidump_file_writer_test_util.cc
index f9211347..01cb6eb2 100644
--- a/minidump/minidump_test_util.cc
+++ b/minidump/minidump_file_writer_test_util.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "minidump/minidump_test_util.h"
+#include "minidump/minidump_file_writer_test_util.h"
 
 #include "gtest/gtest.h"
 
diff --git a/minidump/minidump_test_util.h b/minidump/minidump_file_writer_test_util.h
similarity index 89%
rename from minidump/minidump_test_util.h
rename to minidump/minidump_file_writer_test_util.h
index 3ec8304f..b610f8d1 100644
--- a/minidump/minidump_test_util.h
+++ b/minidump/minidump_file_writer_test_util.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef CRASHPAD_MINIDUMP_MINIDUMP_TEST_UTIL_H_
-#define CRASHPAD_MINIDUMP_MINIDUMP_TEST_UTIL_H_
+#ifndef CRASHPAD_MINIDUMP_MINIDUMP_FILE_WRITER_TEST_UTIL_H_
+#define CRASHPAD_MINIDUMP_MINIDUMP_FILE_WRITER_TEST_UTIL_H_
 
 #include <dbghelp.h>
 #include <stdint.h>
@@ -38,4 +38,4 @@ void VerifyMinidumpHeader(const MINIDUMP_HEADER* header,
 }  // namespace test
 }  // namespace crashpad
 
-#endif  // CRASHPAD_MINIDUMP_MINIDUMP_TEST_UTIL_H_
+#endif  // CRASHPAD_MINIDUMP_MINIDUMP_FILE_WRITER_TEST_UTIL_H_
diff --git a/minidump/minidump_memory_writer_test.cc b/minidump/minidump_memory_writer_test.cc
index e028727e..b13f7127 100644
--- a/minidump/minidump_memory_writer_test.cc
+++ b/minidump/minidump_memory_writer_test.cc
@@ -21,9 +21,9 @@
 #include "gtest/gtest.h"
 #include "minidump/minidump_extensions.h"
 #include "minidump/minidump_file_writer.h"
+#include "minidump/minidump_file_writer_test_util.h"
 #include "minidump/minidump_memory_writer_test_util.h"
 #include "minidump/minidump_stream_writer.h"
-#include "minidump/minidump_test_util.h"
 #include "util/file/string_file_writer.h"
 
 namespace crashpad {
diff --git a/minidump/minidump_misc_info_writer_test.cc b/minidump/minidump_misc_info_writer_test.cc
index 44602bc6..0e31e542 100644
--- a/minidump/minidump_misc_info_writer_test.cc
+++ b/minidump/minidump_misc_info_writer_test.cc
@@ -24,7 +24,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_file_writer.h"
-#include "minidump/minidump_test_util.h"
+#include "minidump/minidump_file_writer_test_util.h"
 #include "util/file/string_file_writer.h"
 #include "util/stdlib/strlcpy.h"
 
diff --git a/minidump/minidump_module_writer_test.cc b/minidump/minidump_module_writer_test.cc
index 51e40168..0000442f 100644
--- a/minidump/minidump_module_writer_test.cc
+++ b/minidump/minidump_module_writer_test.cc
@@ -22,7 +22,7 @@
 #include "gtest/gtest.h"
 #include "minidump/minidump_extensions.h"
 #include "minidump/minidump_file_writer.h"
-#include "minidump/minidump_test_util.h"
+#include "minidump/minidump_file_writer_test_util.h"
 #include "util/file/string_file_writer.h"
 #include "util/misc/uuid.h"
 
diff --git a/minidump/minidump_system_info_writer_test.cc b/minidump/minidump_system_info_writer_test.cc
index 99d494a7..470cef69 100644
--- a/minidump/minidump_system_info_writer_test.cc
+++ b/minidump/minidump_system_info_writer_test.cc
@@ -21,7 +21,7 @@
 
 #include "gtest/gtest.h"
 #include "minidump/minidump_file_writer.h"
-#include "minidump/minidump_test_util.h"
+#include "minidump/minidump_file_writer_test_util.h"
 #include "util/file/string_file_writer.h"
 
 namespace crashpad {
diff --git a/minidump/minidump_thread_writer_test.cc b/minidump/minidump_thread_writer_test.cc
index 4b7dad99..b06590dc 100644
--- a/minidump/minidump_thread_writer_test.cc
+++ b/minidump/minidump_thread_writer_test.cc
@@ -22,7 +22,7 @@
 #include "minidump/minidump_memory_writer.h"
 #include "minidump/minidump_memory_writer_test_util.h"
 #include "minidump/minidump_file_writer.h"
-#include "minidump/minidump_test_util.h"
+#include "minidump/minidump_file_writer_test_util.h"
 #include "util/file/string_file_writer.h"
 
 namespace crashpad {