diff --git a/repository/repository-mysql/src/test/java/org/apache/sqoop/integration/repository/mysql/TestJobHandling.java b/repository/repository-mysql/src/test/java/org/apache/sqoop/integration/repository/mysql/TestJobHandling.java
index 7a87feec..9109212d 100644
--- a/repository/repository-mysql/src/test/java/org/apache/sqoop/integration/repository/mysql/TestJobHandling.java
+++ b/repository/repository-mysql/src/test/java/org/apache/sqoop/integration/repository/mysql/TestJobHandling.java
@@ -17,6 +17,7 @@
  */
 package org.apache.sqoop.integration.repository.mysql;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -145,9 +146,13 @@ public void testFindJobsByConnector() throws Exception {
         .findJobsForConnectorUpgrade(
           handler.findConnector("A", provider.getConnection())
             .getPersistenceId(), provider.getConnection());
+    List<String> jobNames = new ArrayList<String>();
+    for (MJob job : list) {
+      jobNames.add(job.getName());
+    }
     assertEquals(2, list.size());
-    assertEquals(JOB_A_NAME, list.get(0).getName());
-    assertEquals(JOB_B_NAME, list.get(1).getName());
+    assertTrue(jobNames.contains(JOB_A_NAME));
+    assertTrue(jobNames.contains(JOB_B_NAME));
   }
 
   @Test
diff --git a/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/PostgresqlTestCase.java b/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/PostgresqlTestCase.java
index 2311f8ba..4ddfbc3f 100644
--- a/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/PostgresqlTestCase.java
+++ b/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/PostgresqlTestCase.java
@@ -62,7 +62,8 @@ public void setUpClass() {
   @BeforeMethod(alwaysRun = true)
   public void setUp() throws Exception {
     provider.start();
-
+    // clear the data for sqoop
+    provider.dropSchema("SQOOP");
     handler = new PostgresqlRepositoryHandler();
     handler.createOrUpgradeRepository(provider.getConnection());
   }