diff --git a/payments-api/pom.xml b/payments-api/pom.xml
index 69846b1a..c7cae335 100644
--- a/payments-api/pom.xml
+++ b/payments-api/pom.xml
@@ -35,7 +35,7 @@
 			<artifactId>jackson-module-jaxb-annotations</artifactId>
 			<version>2.9.6</version>
 		</dependency>
-		<!-- 
+		<!--
 		<dependency>
 			<groupId>org.jmockit</groupId>
 			<artifactId>jmockit</artifactId>
@@ -111,16 +111,19 @@
 					</archive>
 				</configuration>
 			</plugin>
-			<!--
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>3.0.0-M3</version>
 				<configuration>
                     <argLine>
-                        -Djdk.attach.allowAttachSelf 
+                        -Djdk.attach.allowAttachSelf
                     </argLine>
-			</plugin> -->
+					<suiteXmlFiles>
+						<suiteXmlFile>testng-devkit.xml</suiteXmlFile>
+					</suiteXmlFiles>
+				</configuration>
+			</plugin>
 			<plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
diff --git a/payments-api/testng-devkit.xml b/payments-api/testng-devkit.xml
new file mode 100644
index 00000000..022afaec
--- /dev/null
+++ b/payments-api/testng-devkit.xml
@@ -0,0 +1,13 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Payments" parallel="false">
+    <test name="Payments">
+        <packages>
+            <package name="com.intuit.payment.config" />
+            <package name="com.intuit.payment.data" />
+            <package name="com.intuit.payment.exception" />
+            <package name="com.intuit.payment.http" />
+            <package name="com.intuit.payment.services.base" />
+            <package name="com.intuit.payment.util" />
+        </packages>
+    </test>
+</suite>
\ No newline at end of file
diff --git a/payments-api/testng.xml b/payments-api/testng.xml
new file mode 100644
index 00000000..e64d3f8c
--- /dev/null
+++ b/payments-api/testng.xml
@@ -0,0 +1,6 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="MainSuite">
+    <suite-files>
+        <suite-file path="testng-devkit.xml" />
+    </suite-files>
+</suite>
\ No newline at end of file