diff --git a/CHANGES.txt b/CHANGES.txt
index ce7d7ff..ab6f7d7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -178,6 +178,8 @@
   OPTIMIZATIONS
 
   BUG FIXES
+  HCAT-606 remove hcatalog test includes/excludes files (traviscrawford)
+
   HCAT-599 NotificationListener doesn't use getTopic() for sending messages. (mithun via traviscrawford)
 
   HCAT-605 HCatalog release script does not update version in build.properties (traviscrawford)
diff --git a/build.properties b/build.properties
index 992962b..7695db1 100644
--- a/build.properties
+++ b/build.properties
@@ -39,8 +39,6 @@
 mvnrepo=http://repo2.maven.org/maven2
 test.src.dir=${basedir}/src/test
 test.junit.output.format=plain
-test.all.file=${test.src.dir}/all-tests
-test.exclude.file=${test.src.dir}/excluded-tests
 test.output=no
 test.excludes=e2e/**
 clover.jar=${clover.home}/lib/clover.jar
diff --git a/storage-handlers/hbase/build.xml b/storage-handlers/hbase/build.xml
index c7f4d60..23031ca 100644
--- a/storage-handlers/hbase/build.xml
+++ b/storage-handlers/hbase/build.xml
@@ -64,8 +64,6 @@
     <property name="test.data.dir" value="${test.build.dir}/data" />
     <property name="test.timeout" value="2700000" />
     <property name="test.junit.output.format" value="plain" />
-    <property name="test.all.file" value="${test.src.dir}/all-tests"/>
-    <property name="test.exclude.file" value="${test.src.dir}/excluded-tests"/>
     <property name="test.output" value="no"/>
     <property name="hive.conf.dir" value="${hive.root}/conf"/>
 
@@ -150,12 +148,7 @@
                 <formatter type="${test.junit.output.format}" />
                 <!-- If the user has not defined a particular test to run, run them all -->
                 <batchtest fork="yes" todir="${test.log.dir}" unless="testcase">
-                    <fileset dir="src/test">
-                        <patternset>
-                            <includesfile name="${test.all.file}"/>
-                            <excludesfile name="${test.exclude.file}"/>
-                        </patternset>
-                    </fileset>
+                    <fileset dir="src/test" includes="**/Test*.java"/>
                     <fileset dir="src/test" includes="**/lock/*Test.java"/>
                 </batchtest>
                 <!-- Run one test case.  To use this define -Dtestcase=X on the command line -->
diff --git a/storage-handlers/hbase/src/test/all-tests b/storage-handlers/hbase/src/test/all-tests
deleted file mode 100644
index a945de6..0000000
--- a/storage-handlers/hbase/src/test/all-tests
+++ /dev/null
@@ -1 +0,0 @@
-**/Test*.java
diff --git a/storage-handlers/hbase/src/test/excluded-tests b/storage-handlers/hbase/src/test/excluded-tests
deleted file mode 100644
index 8b13789..0000000
--- a/storage-handlers/hbase/src/test/excluded-tests
+++ /dev/null
@@ -1 +0,0 @@
-