diff --git a/src/test/com/cloudera/sqoop/manager/OracleExportTest.java b/src/test/com/cloudera/sqoop/manager/OracleExportTest.java
index 7ee3d944..e716510c 100644
--- a/src/test/com/cloudera/sqoop/manager/OracleExportTest.java
+++ b/src/test/com/cloudera/sqoop/manager/OracleExportTest.java
@@ -271,10 +271,10 @@ public void testUpsertTextExport() throws IOException, SQLException {
     createTable();
     // first time will be insert.
     runExport(getArgv(true, 10, 10, newStrArray(null,
-        "--update-key", "ID", "--update-mode", "allowinsert")));
+        "--update-key", "id", "--update-mode", "allowinsert")));
     // second time will be update.
     runExport(getArgv(true, 10, 10, newStrArray(null,
-        "--update-key", "ID", "--update-mode", "allowinsert")));
+        "--update-key", "id", "--update-mode", "allowinsert")));
     verifyExport(TOTAL_RECORDS);
   }
 }
diff --git a/src/test/com/cloudera/sqoop/manager/OracleUtils.java b/src/test/com/cloudera/sqoop/manager/OracleUtils.java
index 655aa61f..e99dfa97 100644
--- a/src/test/com/cloudera/sqoop/manager/OracleUtils.java
+++ b/src/test/com/cloudera/sqoop/manager/OracleUtils.java
@@ -45,7 +45,7 @@ public final class OracleUtils {
   public static final String ORACLE_SECONDARY_USER_PASS = "ABCDEF";
 
   public static final String ORACLE_INVALID_USER_NAME = "invalidusr";
-  public static final String SYSTEMTEST_TABLE_NAME = "oraoop_test";
+  public static final String SYSTEMTEST_TABLE_NAME = "ORAOOP_TEST";
   public static final int SYSTEMTEST_NUM_ROWS = 100;
   public static final int INTEGRATIONTEST_NUM_ROWS = 10000;
   // Number of mappers if wanting to override default setting
diff --git a/src/test/org/apache/sqoop/manager/oracle/ExportTest.java b/src/test/org/apache/sqoop/manager/oracle/ExportTest.java
index 80b65362..991b2212 100644
--- a/src/test/org/apache/sqoop/manager/oracle/ExportTest.java
+++ b/src/test/org/apache/sqoop/manager/oracle/ExportTest.java
@@ -40,21 +40,21 @@ public static void setUpHdfsData() throws Exception {
     TEST_CASE.createTable("table_tst_product.xml");
 
     int retCode =
-        TEST_CASE.runImport("tst_product", TEST_CASE.getSqoopConf(), false);
+ TEST_CASE.runImport("TST_PRODUCT", TEST_CASE.getSqoopConf(), false);
     Assert.assertEquals("Return code should be 0", 0, retCode);
   }
 
   @Test
   public void testProductExport() throws Exception {
     int retCode =
-        TEST_CASE.runExportFromTemplateTable("tst_product", "tst_product_exp");
+        TEST_CASE.runExportFromTemplateTable("TST_PRODUCT", "TST_PRODUCT_EXP");
     Assert.assertEquals("Return code should be 0", 0, retCode);
   }
 
   @Test
   public void testProductExportMixedCaseTableName() throws Exception {
     int retCode =
-        TEST_CASE.runExportFromTemplateTable("tst_product",
+        TEST_CASE.runExportFromTemplateTable("TST_PRODUCT",
             "\"\"T5+_Pr#duct_Exp\"\"");
     Assert.assertEquals("Return code should be 0", 0, retCode);
   }
diff --git a/src/test/org/apache/sqoop/manager/oracle/OracleCallExportTest.java b/src/test/org/apache/sqoop/manager/oracle/OracleCallExportTest.java
index 44b2f9af..431df0fe 100644
--- a/src/test/org/apache/sqoop/manager/oracle/OracleCallExportTest.java
+++ b/src/test/org/apache/sqoop/manager/oracle/OracleCallExportTest.java
@@ -90,23 +90,23 @@ private String[] getArgv(String... extraArgs) {
   private void createObjects() {
 
     String createTableSql = "CREATE TABLE " + tableName + " ( "
-      + "id  INT NOT NULL PRIMARY KEY, "
-      + "msg VARCHAR(24) NOT NULL, "
-      + "d DATE, "
-      + "f FLOAT, "
-      + "vc VARCHAR(32))";
+      + "\"id\"  INT NOT NULL PRIMARY KEY, "
+      + "\"msg\" VARCHAR(24) NOT NULL, "
+      + "\"d\" DATE, "
+      + "\"f\" FLOAT, "
+      + "\"vc\" VARCHAR(32))";
 
     String createProcSql = "CREATE PROCEDURE " + procName + " ( "
-      + "id IN INT,"
-      + "msg IN VARCHAR,"
-      + "d IN DATE,"
-      + "f IN FLOAT) IS BEGIN "
+      + "\"id\" IN INT,"
+      + "\"msg\" IN VARCHAR,"
+      + "\"d\" IN DATE,"
+      + "\"f\" IN FLOAT) IS BEGIN "
       + "INSERT INTO " + tableName + " "
-      + "VALUES(id,"
-      + "msg,"
-      + "d,"
-      + "f,"
-      + "msg || '_2'); END;";
+      + "VALUES(\"id\","
+      + "\"msg\","
+      + "\"d\","
+      + "\"f\","
+      + "\"msg\" || '_2'); END;";
 
     try {
       dropTableIfExists(tableName);
diff --git a/src/test/org/apache/sqoop/manager/oracle/TimestampDataTest.java b/src/test/org/apache/sqoop/manager/oracle/TimestampDataTest.java
index f3385959..6ceccd15 100644
--- a/src/test/org/apache/sqoop/manager/oracle/TimestampDataTest.java
+++ b/src/test/org/apache/sqoop/manager/oracle/TimestampDataTest.java
@@ -39,7 +39,7 @@ public void testProductImportTimezone() throws Exception {
     sqoopConf.setBoolean(OraOopConstants.ORAOOP_MAP_TIMESTAMP_AS_STRING, false);
 
     try {
-      int retCode = runImport("tst_product", sqoopConf, false);
+      int retCode = runImport("TST_PRODUCT", sqoopConf, false);
       Assert.assertEquals("Return code should be 0", 0, retCode);
 
     } finally {