diff --git a/Makefile.am b/Makefile.am
index 4763d9495..0d8fe1035 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -605,6 +605,8 @@ php_EXTRA_DIST=                                              \
   php/tests/test.proto                                       \
   php/tests/test.pb.php                                      \
   php/tests/memory_leak_test.php                             \
+  php/tests/google/protobuf/empty.pb.php                     \
+  php/tests/well_known_test.php                              \
   php/README.md                                              \
   php/ext/google/protobuf/utf8.h                             \
   php/ext/google/protobuf/message.c                          \
@@ -712,6 +714,7 @@ python_EXTRA_DIST=                                                           \
   python/google/protobuf/pyext/repeated_composite_container.h                \
   python/google/protobuf/pyext/repeated_scalar_container.cc                  \
   python/google/protobuf/pyext/repeated_scalar_container.h                   \
+  python/google/protobuf/pyext/safe_numerics.h                               \
   python/google/protobuf/pyext/scoped_pyobject_ptr.h                         \
   python/google/protobuf/reflection.py                                       \
   python/google/protobuf/service.py                                          \
diff --git a/tests.sh b/tests.sh
index 4ac6b7c68..eb8255e14 100755
--- a/tests.sh
+++ b/tests.sh
@@ -51,7 +51,7 @@ build_cpp_distcheck() {
   make dist
 
   # List all files that should be included in the distribution package.
-  git ls-files | grep "^\(java\|python\|objectivec\|csharp\|js\|ruby\|cmake\|examples\)" |\
+  git ls-files | grep "^\(java\|python\|objectivec\|csharp\|js\|ruby\|php\|cmake\|examples\)" |\
       grep -v ".gitignore" | grep -v "java/compatibility_tests" > dist.lst
   # Unzip the dist tar file.
   DIST=`ls *.tar.gz`