diff --git a/python/google/protobuf/internal/text_format_test.py b/python/google/protobuf/internal/text_format_test.py
index a85d4dd898..d27ff7a272 100755
--- a/python/google/protobuf/internal/text_format_test.py
+++ b/python/google/protobuf/internal/text_format_test.py
@@ -90,7 +90,7 @@ class TextFormatTest(basetest.TestCase):
     self.CompareToGoldenFile(
         self.RemoveRedundantZeros(
             text_format.MessageToString(message, pointy_brackets=True)),
-        'text_format_unittest_data_pointy_oneof_implemented.txt')
+        'text_format_unittest_data_pointy_oneof.txt')
 
   def testPrintAllExtensionsPointy(self):
     message = unittest_pb2.TestAllExtensions()
diff --git a/src/Makefile.am b/src/Makefile.am
index 3a164ff168..9592f6f677 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -246,9 +246,11 @@ EXTRA_DIST =                                                   \
   google/protobuf/testdata/golden_message                      \
   google/protobuf/testdata/golden_message_oneof_implemented    \
   google/protobuf/testdata/golden_packed_fields_message        \
+  google/protobuf/testdata/bad_utf8_string                     \
+  google/protobuf/testdata/text_format_unittest_data.txt       \
   google/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt  \
   google/protobuf/testdata/text_format_unittest_data_pointy.txt             \
-  google/protobuf/testdata/text_format_unittest_data_pointy_oneof_implemented.txt \
+  google/protobuf/testdata/text_format_unittest_data_pointy_oneof.txt       \
   google/protobuf/testdata/text_format_unittest_extensions_data.txt         \
   google/protobuf/testdata/text_format_unittest_extensions_data_pointy.txt  \
   google/protobuf/package_info.h                               \
diff --git a/src/google/protobuf/testdata/text_format_unittest_data_pointy_oneof_implemented.txt b/src/google/protobuf/testdata/text_format_unittest_data_pointy_oneof.txt
similarity index 100%
rename from src/google/protobuf/testdata/text_format_unittest_data_pointy_oneof_implemented.txt
rename to src/google/protobuf/testdata/text_format_unittest_data_pointy_oneof.txt