diff --git a/.gitignore b/.gitignore
index 6e47454..a4ee8e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,44 +1,8 @@
-invIndex*
 opttest
-primaryBTree*
 target
 .classpath
 .settings
 .project
-ClusterControllerService
-rttest
-mdtest
-ittest
-asterix_logs
-build
-*-coredump
-*.pyc
-*.iml
-.idea
-*.ipr
-*.iws
 git.properties
-actual
-exception
-expected
-teststore1
-teststore2
-dev1
-dev2
-dev3
-dev4
-derby.log
-hadoop-conf-tmp
-metastore_db
-teststore
-output
-tmp
-dist
-*~
 .DS_Store
 *.swp
-.m2*
-ß
-/target/
-/target/
-/target/
diff --git a/src/test/resources/runtimets/testsuite.xml b/src/test/resources/runtimets/testsuite.xml
new file mode 100644
index 0000000..997dc77
--- /dev/null
+++ b/src/test/resources/runtimets/testsuite.xml
@@ -0,0 +1,37 @@
+<test-suite  xmlns="urn:xml.testframework.asterix.apache.org"
+             ResultOffsetPath="results"
+             QueryOffsetPath="queries"
+             QueryFileExtension=".aql">
+  <test-group name="channel">
+    <test-case FilePath="channel">
+        <compilation-unit name="room_occupants">
+            <output-dir compare="Text">room_occupants</output-dir>
+        </compilation-unit>
+    </test-case>
+    <test-case FilePath="channel">
+        <compilation-unit name="create_channel_check_datasets">
+            <output-dir compare="Text">create_channel_check_datasets</output-dir>
+        </compilation-unit>
+    </test-case>
+    <test-case FilePath="channel">
+        <compilation-unit name="create_channel_check_metadata">
+            <output-dir compare="Text">create_channel_check_metadata</output-dir>
+        </compilation-unit>
+    </test-case>
+    <test-case FilePath="channel">
+        <compilation-unit name="drop_channel_check_datasets">
+            <output-dir compare="Text">drop_channel_check_datasets</output-dir>
+        </compilation-unit>
+    </test-case>
+    <test-case FilePath="channel">
+        <compilation-unit name="drop_channel_check_metadata">
+            <output-dir compare="Text">drop_channel_check_metadata</output-dir>
+        </compilation-unit>
+    </test-case>
+            <test-case FilePath="channel">
+        <compilation-unit name="subscribe_channel_check_subscriptions">
+            <output-dir compare="Text">subscribe_channel_check_subscriptions</output-dir>
+        </compilation-unit>
+    </test-case>
+  </test-group>
+</test-suite>