diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/.classpath b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/.classpath
index 751c8f2..cf36b56 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/.classpath
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/.project b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/.project
index ae22afd..fc1feb6 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/.project
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/.project
@@ -20,8 +20,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/META-INF/MANIFEST.MF
index a561c15..960f4cd 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: DTP ODA Consumer Helper Tests Suite
 Bundle-SymbolicName: org.eclipse.datatools.connectivity.oda.consumer.tests;singleton:=true
-Bundle-Version: 3.2.4.qualifier
+Bundle-Version: 3.2.5.qualifier
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.junit;bundle-version="[3.8.1,5.0.0)",
  org.eclipse.datatools.connectivity.oda.consumer;bundle-version="[3.2.4,4.0.0)",
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/pom.xml b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/pom.xml
index 0f73b10..56009cf 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/pom.xml
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/pom.xml
@@ -9,6 +9,19 @@
   </parent>
   <groupId>org.eclipse.datatools.tests</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.consumer.tests</artifactId>
-  <version>3.2.4-SNAPSHOT</version>
+  <version>3.2.5-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <configuration>
+            <testSuite>org.eclipse.datatools.connectivity.oda.consumer.tests</testSuite>
+            <testClass>org.eclipse.datatools.connectivity.oda.consumer.tests.AllTestSuites</testClass>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/AllTestSuites.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/AllTestSuites.java
new file mode 100644
index 0000000..fb5ae9c
--- /dev/null
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/AllTestSuites.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2018 Red Hat Inc and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ *******************************************************************************/
+
+package org.eclipse.datatools.connectivity.oda.consumer.tests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTestSuites extends TestSuite {
+	public static Test suite() {
+		return new AllTestSuites();
+	}
+
+	public AllTestSuites() {
+		super("Unit Tests");
+//	    addTestSuite(AdvQueryTest.class);
+//	    addTestSuite(AppContextTest.class);
+		addTestSuite(BinaryCompatibiltyTest.class);
+//	    addTestSuite(ConnectionTest.class);
+		addTestSuite(ConsumerMessagesTest.class);
+//	    addTestSuite(DataSetMetaDataTest.class);
+//	    addTestSuite(DriverBridgeTest.class);
+//	    addTestSuite(DriverTest.class);
+		addTestSuite(FlatFileTestCase.class);
+//	    addTestSuite(LoggerInstanceTest.class);
+		addTestSuite(OdaBlobTest.class);
+		addTestSuite(OdaClobTest.class);
+//	    addTestSuite(OutputParametersTest.class);
+//	    addTestSuite(ParameterRowSetTest.class);
+//	    addTestSuite(ParamMetaDataTest.class);
+//	    addTestSuite(PropertyProviderTest.class);
+//	    addTestSuite(QueryTest.class);
+//	    addTestSuite(ResultSetMetaDataTest.class);
+//	    addTestSuite(ResultSetTest.class);
+//	    addTestSuite(TraceLogConfigTest.class);
+		addTestSuite(TraceLogTest.class);
+	}
+
+}