diff --git a/hadoop-common/CHANGES.txt b/hadoop-common/CHANGES.txt
index e3d92e07b2..f8b24db420 100644
--- a/hadoop-common/CHANGES.txt
+++ b/hadoop-common/CHANGES.txt
@@ -495,6 +495,9 @@ Trunk (unreleased changes)
 
     HADOOP-7529. Fix lock cycles in metrics system. (llu)
 
+    HADOOP-7545. Common -tests JAR should not include properties and configs.
+    (todd)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-common/pom.xml b/hadoop-common/pom.xml
index 9a16c3261a..eb10c0d50c 100644
--- a/hadoop-common/pom.xml
+++ b/hadoop-common/pom.xml
@@ -279,11 +279,23 @@
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
+            <id>prepare-jar</id>
             <phase>prepare-package</phase>
             <goals>
               <goal>jar</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>prepare-test-jar</id>
+            <phase>prepare-package</phase>
+            <goals>
               <goal>test-jar</goal>
             </goals>
+            <configuration>
+              <includes>
+                <include>**/*.class</include>
+              </includes>
+            </configuration>
           </execution>
         </executions>
       </plugin>