diff --git a/CHANGES.txt b/CHANGES.txt
index 73a7bdee282..cae324fce74 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -565,6 +565,8 @@ Release 0.21.0 - Unreleased
    HBASE-2540  Make QueryMatcher.MatchCode public (Clint Morgan via Stack)
    HBASE-2524  Unresponsive region server, potential deadlock
                (Todd Lipcon via Stack)
+   HBASE-2547  [mvn] assembly:assembly does not include hbase-X.X.X-test.jar
+               (Paul Smith via Stack)
 
   NEW FEATURES
    HBASE-1961  HBase EC2 scripts
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
index 9bc7273df0d..8679900c48a 100644
--- a/src/assembly/bin.xml
+++ b/src/assembly/bin.xml
@@ -23,6 +23,18 @@
         </dependencySets>
       </binaries>
     </moduleSet>
+   <!-- Test jar-->
+   <moduleSet>
+     <includes>
+       <include>org.apache.hbase:hbase-core</include>
+     </includes>
+     <binaries>
+       <attachmentClassifier>tests</attachmentClassifier>
+       <outputFileNameMapping>hbase-${version}${dashClassifier}.jar</outputFileNameMapping>
+       <outputDirectory>/</outputDirectory>
+       <unpack>false</unpack>
+     </binaries>
+   </moduleSet>
     <!-- This ensures that the source jars are added-->
     <moduleSet>
       <includes>