diff --git a/src/test/org/apache/sqoop/cloud/TestAvroImport.java b/src/test/org/apache/sqoop/cloud/AbstractTestAvroImport.java
similarity index 92%
rename from src/test/org/apache/sqoop/cloud/TestAvroImport.java
rename to src/test/org/apache/sqoop/cloud/AbstractTestAvroImport.java
index f54d1e92..1c932855 100644
--- a/src/test/org/apache/sqoop/cloud/TestAvroImport.java
+++ b/src/test/org/apache/sqoop/cloud/AbstractTestAvroImport.java
@@ -29,14 +29,14 @@
 
 import java.io.IOException;
 
-public abstract class TestAvroImport extends CloudImportJobTestCase {
+public abstract class AbstractTestAvroImport extends CloudImportJobTestCase {
 
-  public static final Log LOG = LogFactory.getLog(TestAvroImport.class.getName());
+  public static final Log LOG = LogFactory.getLog(AbstractTestAvroImport.class.getName());
 
   @Rule
   public ExpectedException thrown = ExpectedException.none();
 
-  protected TestAvroImport(CloudCredentialsRule credentialsRule) {
+  protected AbstractTestAvroImport(CloudCredentialsRule credentialsRule) {
     super(credentialsRule);
   }
 
diff --git a/src/test/org/apache/sqoop/cloud/TestExternalHiveTableImport.java b/src/test/org/apache/sqoop/cloud/AbstractTestExternalHiveTableImport.java
similarity index 91%
rename from src/test/org/apache/sqoop/cloud/TestExternalHiveTableImport.java
rename to src/test/org/apache/sqoop/cloud/AbstractTestExternalHiveTableImport.java
index b918c840..730f0408 100644
--- a/src/test/org/apache/sqoop/cloud/TestExternalHiveTableImport.java
+++ b/src/test/org/apache/sqoop/cloud/AbstractTestExternalHiveTableImport.java
@@ -38,7 +38,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-public abstract class TestExternalHiveTableImport extends CloudImportJobTestCase {
+public abstract class AbstractTestExternalHiveTableImport extends CloudImportJobTestCase {
 
   private static CloudTestDataSet dataSet = new CloudTestDataSet();
 
@@ -48,13 +48,13 @@ public static Iterable<? extends Object> parameters() {
         new Object[]{FMT_PARQUETFILE_ARG, dataSet.getExpectedParquetOutput()});
   }
 
-  public static final Log LOG = LogFactory.getLog(TestExternalHiveTableImport.class.getName());
+  public static final Log LOG = LogFactory.getLog(AbstractTestExternalHiveTableImport.class.getName());
 
   private String fileFormatArg;
 
   private List<String> expectedResult;
 
-  protected TestExternalHiveTableImport(CloudCredentialsRule credentialsRule, String fileFormatArg, List<String> expectedResult) {
+  protected AbstractTestExternalHiveTableImport(CloudCredentialsRule credentialsRule, String fileFormatArg, List<String> expectedResult) {
     super(credentialsRule);
     this.fileFormatArg = fileFormatArg;
     this.expectedResult = expectedResult;
diff --git a/src/test/org/apache/sqoop/cloud/TestImportWithHadoopCredProvider.java b/src/test/org/apache/sqoop/cloud/AbstractTestImportWithHadoopCredProvider.java
similarity index 95%
rename from src/test/org/apache/sqoop/cloud/TestImportWithHadoopCredProvider.java
rename to src/test/org/apache/sqoop/cloud/AbstractTestImportWithHadoopCredProvider.java
index 2ab35b83..82d13d80 100644
--- a/src/test/org/apache/sqoop/cloud/TestImportWithHadoopCredProvider.java
+++ b/src/test/org/apache/sqoop/cloud/AbstractTestImportWithHadoopCredProvider.java
@@ -40,9 +40,9 @@
 import java.io.IOException;
 import java.nio.file.Files;
 
-public abstract class TestImportWithHadoopCredProvider extends CloudImportJobTestCase {
+public abstract class AbstractTestImportWithHadoopCredProvider extends CloudImportJobTestCase {
 
-  public static final Log LOG = LogFactory.getLog(TestImportWithHadoopCredProvider.class.getName());
+  public static final Log LOG = LogFactory.getLog(AbstractTestImportWithHadoopCredProvider.class.getName());
 
   private static String providerPathDefault;
   private static String providerPathEnv;
@@ -72,11 +72,11 @@ public static void fillCredentialProviderFiles() throws Exception {
     fillCredentialProviderEnv();
   }
 
-  public TestImportWithHadoopCredProvider() {
+  public AbstractTestImportWithHadoopCredProvider() {
     this(CredentialProviderHelper.HADOOP_CREDENTIAL_PROVIDER_PATH);
   }
 
-  public TestImportWithHadoopCredProvider(String credentialProviderPathProperty) {
+  public AbstractTestImportWithHadoopCredProvider(String credentialProviderPathProperty) {
     super(credentialsRule);
     this.credentialProviderPathProperty = credentialProviderPathProperty;
   }
diff --git a/src/test/org/apache/sqoop/cloud/TestIncrementalAppendAvroImport.java b/src/test/org/apache/sqoop/cloud/AbstractTestIncrementalAppendAvroImport.java
similarity index 92%
rename from src/test/org/apache/sqoop/cloud/TestIncrementalAppendAvroImport.java
rename to src/test/org/apache/sqoop/cloud/AbstractTestIncrementalAppendAvroImport.java
index 5c7c915e..d34b27d2 100644
--- a/src/test/org/apache/sqoop/cloud/TestIncrementalAppendAvroImport.java
+++ b/src/test/org/apache/sqoop/cloud/AbstractTestIncrementalAppendAvroImport.java
@@ -31,14 +31,14 @@
 
 import java.io.IOException;
 
-public abstract class TestIncrementalAppendAvroImport extends CloudImportJobTestCase {
+public abstract class AbstractTestIncrementalAppendAvroImport extends CloudImportJobTestCase {
 
-  public static final Log LOG = LogFactory.getLog(TestIncrementalAppendAvroImport.class.getName());
+  public static final Log LOG = LogFactory.getLog(AbstractTestIncrementalAppendAvroImport.class.getName());
 
   @Rule
   public ExpectedException thrown = ExpectedException.none();
 
-  protected TestIncrementalAppendAvroImport(CloudCredentialsRule credentialsRule) {
+  protected AbstractTestIncrementalAppendAvroImport(CloudCredentialsRule credentialsRule) {
     super(credentialsRule);
   }
 
diff --git a/src/test/org/apache/sqoop/cloud/TestIncrementalAppendParquetImport.java b/src/test/org/apache/sqoop/cloud/AbstractTestIncrementalAppendParquetImport.java
similarity index 93%
rename from src/test/org/apache/sqoop/cloud/TestIncrementalAppendParquetImport.java
rename to src/test/org/apache/sqoop/cloud/AbstractTestIncrementalAppendParquetImport.java
index a075377b..88da0a39 100644
--- a/src/test/org/apache/sqoop/cloud/TestIncrementalAppendParquetImport.java
+++ b/src/test/org/apache/sqoop/cloud/AbstractTestIncrementalAppendParquetImport.java
@@ -32,14 +32,14 @@
 
 import java.util.List;
 
-public abstract class TestIncrementalAppendParquetImport extends CloudImportJobTestCase {
+public abstract class AbstractTestIncrementalAppendParquetImport extends CloudImportJobTestCase {
 
-  public static final Log LOG = LogFactory.getLog(TestIncrementalAppendParquetImport.class.getName());
+  public static final Log LOG = LogFactory.getLog(AbstractTestIncrementalAppendParquetImport.class.getName());
 
   @Rule
   public ExpectedException thrown = ExpectedException.none();
 
-  protected TestIncrementalAppendParquetImport(CloudCredentialsRule credentialsRule) {
+  protected AbstractTestIncrementalAppendParquetImport(CloudCredentialsRule credentialsRule) {
     super(credentialsRule);
   }
 
diff --git a/src/test/org/apache/sqoop/cloud/TestIncrementalAppendSequenceFileImport.java b/src/test/org/apache/sqoop/cloud/AbstractTestIncrementalAppendSequenceFileImport.java
similarity index 92%
rename from src/test/org/apache/sqoop/cloud/TestIncrementalAppendSequenceFileImport.java
rename to src/test/org/apache/sqoop/cloud/AbstractTestIncrementalAppendSequenceFileImport.java
index 5032a9c9..5b2ad79b 100644
--- a/src/test/org/apache/sqoop/cloud/TestIncrementalAppendSequenceFileImport.java
+++ b/src/test/org/apache/sqoop/cloud/AbstractTestIncrementalAppendSequenceFileImport.java
@@ -29,14 +29,14 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-public abstract class TestIncrementalAppendSequenceFileImport extends CloudImportJobTestCase {
+public abstract class AbstractTestIncrementalAppendSequenceFileImport extends CloudImportJobTestCase {
 
-  public static final Log LOG = LogFactory.getLog(TestIncrementalAppendSequenceFileImport.class.getName());
+  public static final Log LOG = LogFactory.getLog(AbstractTestIncrementalAppendSequenceFileImport.class.getName());
 
   @Rule
   public ExpectedException thrown = ExpectedException.none();
 
-  protected TestIncrementalAppendSequenceFileImport(CloudCredentialsRule credentialsRule) {
+  protected AbstractTestIncrementalAppendSequenceFileImport(CloudCredentialsRule credentialsRule) {
     super(credentialsRule);
   }
 
diff --git a/src/test/org/apache/sqoop/cloud/TestIncrementalAppendTextImport.java b/src/test/org/apache/sqoop/cloud/AbstractTestIncrementalAppendTextImport.java
similarity index 92%
rename from src/test/org/apache/sqoop/cloud/TestIncrementalAppendTextImport.java
rename to src/test/org/apache/sqoop/cloud/AbstractTestIncrementalAppendTextImport.java
index c9bfbe4b..1ecf6351 100644
--- a/src/test/org/apache/sqoop/cloud/TestIncrementalAppendTextImport.java
+++ b/src/test/org/apache/sqoop/cloud/AbstractTestIncrementalAppendTextImport.java
@@ -31,14 +31,14 @@
 
 import java.io.IOException;
 
-public abstract class TestIncrementalAppendTextImport extends CloudImportJobTestCase {
+public abstract class AbstractTestIncrementalAppendTextImport extends CloudImportJobTestCase {
 
-  public static final Log LOG = LogFactory.getLog(TestIncrementalAppendTextImport.class.getName());
+  public static final Log LOG = LogFactory.getLog(AbstractTestIncrementalAppendTextImport.class.getName());
 
   @Rule
   public ExpectedException thrown = ExpectedException.none();
 
-  protected TestIncrementalAppendTextImport(CloudCredentialsRule credentialsRule) {
+  protected AbstractTestIncrementalAppendTextImport(CloudCredentialsRule credentialsRule) {
     super(credentialsRule);
   }
 
diff --git a/src/test/org/apache/sqoop/cloud/TestIncrementalMergeParquetImport.java b/src/test/org/apache/sqoop/cloud/AbstractTestIncrementalMergeParquetImport.java
similarity index 93%
rename from src/test/org/apache/sqoop/cloud/TestIncrementalMergeParquetImport.java
rename to src/test/org/apache/sqoop/cloud/AbstractTestIncrementalMergeParquetImport.java
index 2058c8ce..0376dc67 100644
--- a/src/test/org/apache/sqoop/cloud/TestIncrementalMergeParquetImport.java
+++ b/src/test/org/apache/sqoop/cloud/AbstractTestIncrementalMergeParquetImport.java
@@ -33,9 +33,9 @@
 
 import java.util.List;
 
-public abstract class TestIncrementalMergeParquetImport extends CloudImportJobTestCase {
+public abstract class AbstractTestIncrementalMergeParquetImport extends CloudImportJobTestCase {
 
-  public static final Log LOG = LogFactory.getLog(TestIncrementalMergeParquetImport.class.getName());
+  public static final Log LOG = LogFactory.getLog(AbstractTestIncrementalMergeParquetImport.class.getName());
 
   @Rule
   public ExpectedException thrown = ExpectedException.none();
@@ -47,7 +47,7 @@ public void setUp() {
     createTestTableFromInitialInputDataForMerge();
   }
 
-  protected TestIncrementalMergeParquetImport(CloudCredentialsRule credentialsRule) {
+  protected AbstractTestIncrementalMergeParquetImport(CloudCredentialsRule credentialsRule) {
     super(credentialsRule);
   }
 
diff --git a/src/test/org/apache/sqoop/cloud/TestIncrementalMergeTextImport.java b/src/test/org/apache/sqoop/cloud/AbstractTestIncrementalMergeTextImport.java
similarity index 92%
rename from src/test/org/apache/sqoop/cloud/TestIncrementalMergeTextImport.java
rename to src/test/org/apache/sqoop/cloud/AbstractTestIncrementalMergeTextImport.java
index e533e206..59833b5a 100644
--- a/src/test/org/apache/sqoop/cloud/TestIncrementalMergeTextImport.java
+++ b/src/test/org/apache/sqoop/cloud/AbstractTestIncrementalMergeTextImport.java
@@ -30,9 +30,9 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-public abstract class TestIncrementalMergeTextImport extends CloudImportJobTestCase {
+public abstract class AbstractTestIncrementalMergeTextImport extends CloudImportJobTestCase {
 
-  public static final Log LOG = LogFactory.getLog(TestIncrementalMergeTextImport.class.getName());
+  public static final Log LOG = LogFactory.getLog(AbstractTestIncrementalMergeTextImport.class.getName());
 
   @Rule
   public ExpectedException thrown = ExpectedException.none();
@@ -44,7 +44,7 @@ public void setUp() {
     createTestTableFromInitialInputDataForMerge();
   }
 
-  protected TestIncrementalMergeTextImport(CloudCredentialsRule credentialsRule) {
+  protected AbstractTestIncrementalMergeTextImport(CloudCredentialsRule credentialsRule) {
     super(credentialsRule);
   }
 
diff --git a/src/test/org/apache/sqoop/cloud/TestParquetImport.java b/src/test/org/apache/sqoop/cloud/AbstractTestParquetImport.java
similarity index 92%
rename from src/test/org/apache/sqoop/cloud/TestParquetImport.java
rename to src/test/org/apache/sqoop/cloud/AbstractTestParquetImport.java
index d66d4f96..6ab33d29 100644
--- a/src/test/org/apache/sqoop/cloud/TestParquetImport.java
+++ b/src/test/org/apache/sqoop/cloud/AbstractTestParquetImport.java
@@ -32,14 +32,14 @@
 import java.io.IOException;
 import java.util.List;
 
-public abstract class TestParquetImport extends CloudImportJobTestCase {
+public abstract class AbstractTestParquetImport extends CloudImportJobTestCase {
 
-  public static final Log LOG = LogFactory.getLog(TestParquetImport.class.getName());
+  public static final Log LOG = LogFactory.getLog(AbstractTestParquetImport.class.getName());
 
   @Rule
   public ExpectedException thrown = ExpectedException.none();
 
-  protected TestParquetImport(CloudCredentialsRule credentialsRule) {
+  protected AbstractTestParquetImport(CloudCredentialsRule credentialsRule) {
     super(credentialsRule);
   }
 
diff --git a/src/test/org/apache/sqoop/cloud/TestSequenceFileImport.java b/src/test/org/apache/sqoop/cloud/AbstractTestSequenceFileImport.java
similarity index 91%
rename from src/test/org/apache/sqoop/cloud/TestSequenceFileImport.java
rename to src/test/org/apache/sqoop/cloud/AbstractTestSequenceFileImport.java
index 55747bc8..4502b576 100644
--- a/src/test/org/apache/sqoop/cloud/TestSequenceFileImport.java
+++ b/src/test/org/apache/sqoop/cloud/AbstractTestSequenceFileImport.java
@@ -29,14 +29,14 @@
 
 import java.io.IOException;
 
-public abstract class TestSequenceFileImport extends CloudImportJobTestCase {
+public abstract class AbstractTestSequenceFileImport extends CloudImportJobTestCase {
 
-  public static final Log LOG = LogFactory.getLog(TestSequenceFileImport.class.getName());
+  public static final Log LOG = LogFactory.getLog(AbstractTestSequenceFileImport.class.getName());
 
   @Rule
   public ExpectedException thrown = ExpectedException.none();
 
-  protected TestSequenceFileImport(CloudCredentialsRule credentialsRule) {
+  protected AbstractTestSequenceFileImport(CloudCredentialsRule credentialsRule) {
     super(credentialsRule);
   }
 
diff --git a/src/test/org/apache/sqoop/cloud/TestTextImport.java b/src/test/org/apache/sqoop/cloud/AbstractTestTextImport.java
similarity index 93%
rename from src/test/org/apache/sqoop/cloud/TestTextImport.java
rename to src/test/org/apache/sqoop/cloud/AbstractTestTextImport.java
index c8077a0b..d37faa36 100644
--- a/src/test/org/apache/sqoop/cloud/TestTextImport.java
+++ b/src/test/org/apache/sqoop/cloud/AbstractTestTextImport.java
@@ -29,14 +29,14 @@
 
 import java.io.IOException;
 
-public abstract class TestTextImport extends CloudImportJobTestCase {
+public abstract class AbstractTestTextImport extends CloudImportJobTestCase {
 
-  public static final Log LOG = LogFactory.getLog(TestTextImport.class.getName());
+  public static final Log LOG = LogFactory.getLog(AbstractTestTextImport.class.getName());
 
   @Rule
   public ExpectedException thrown = ExpectedException.none();
 
-  protected TestTextImport(CloudCredentialsRule credentialsRule) {
+  protected AbstractTestTextImport(CloudCredentialsRule credentialsRule) {
     super(credentialsRule);
   }
 
diff --git a/src/test/org/apache/sqoop/cloud/s3/TestS3AvroImport.java b/src/test/org/apache/sqoop/cloud/s3/TestS3AvroImport.java
index b1ef2ce0..fdc5fbaf 100644
--- a/src/test/org/apache/sqoop/cloud/s3/TestS3AvroImport.java
+++ b/src/test/org/apache/sqoop/cloud/s3/TestS3AvroImport.java
@@ -18,13 +18,13 @@
 
 package org.apache.sqoop.cloud.s3;
 
-import org.apache.sqoop.cloud.TestAvroImport;
+import org.apache.sqoop.cloud.AbstractTestAvroImport;
 import org.apache.sqoop.testcategories.thirdpartytest.S3Test;
 import org.junit.ClassRule;
 import org.junit.experimental.categories.Category;
 
 @Category(S3Test.class)
-public class TestS3AvroImport extends TestAvroImport {
+public class TestS3AvroImport extends AbstractTestAvroImport {
 
   @ClassRule
   public static S3CredentialsRule credentialsRule = new S3CredentialsRule();
diff --git a/src/test/org/apache/sqoop/cloud/s3/TestS3ExternalHiveTableImport.java b/src/test/org/apache/sqoop/cloud/s3/TestS3ExternalHiveTableImport.java
index 69373529..9982d8cd 100644
--- a/src/test/org/apache/sqoop/cloud/s3/TestS3ExternalHiveTableImport.java
+++ b/src/test/org/apache/sqoop/cloud/s3/TestS3ExternalHiveTableImport.java
@@ -18,7 +18,7 @@
 
 package org.apache.sqoop.cloud.s3;
 
-import org.apache.sqoop.cloud.TestExternalHiveTableImport;
+import org.apache.sqoop.cloud.AbstractTestExternalHiveTableImport;
 import org.apache.sqoop.testcategories.thirdpartytest.S3Test;
 import org.apache.sqoop.util.BlockJUnit4ClassRunnerWithParametersFactory;
 import org.junit.ClassRule;
@@ -31,7 +31,7 @@
 @Category(S3Test.class)
 @RunWith(Parameterized.class)
 @Parameterized.UseParametersRunnerFactory(BlockJUnit4ClassRunnerWithParametersFactory.class)
-public class TestS3ExternalHiveTableImport extends TestExternalHiveTableImport {
+public class TestS3ExternalHiveTableImport extends AbstractTestExternalHiveTableImport {
 
   @ClassRule
   public static S3CredentialsRule credentialsRule = new S3CredentialsRule();
diff --git a/src/test/org/apache/sqoop/cloud/s3/TestS3ImportWithHadoopCredProvider.java b/src/test/org/apache/sqoop/cloud/s3/TestS3ImportWithHadoopCredProvider.java
index e6c14b0b..5aca32fc 100644
--- a/src/test/org/apache/sqoop/cloud/s3/TestS3ImportWithHadoopCredProvider.java
+++ b/src/test/org/apache/sqoop/cloud/s3/TestS3ImportWithHadoopCredProvider.java
@@ -18,7 +18,7 @@
 
 package org.apache.sqoop.cloud.s3;
 
-import org.apache.sqoop.cloud.TestImportWithHadoopCredProvider;
+import org.apache.sqoop.cloud.AbstractTestImportWithHadoopCredProvider;
 import org.apache.sqoop.testcategories.thirdpartytest.S3Test;
 import org.apache.sqoop.util.BlockJUnit4ClassRunnerWithParametersFactory;
 import org.apache.sqoop.util.password.CredentialProviderHelper;
@@ -32,7 +32,7 @@
 @Category(S3Test.class)
 @RunWith(Parameterized.class)
 @Parameterized.UseParametersRunnerFactory(BlockJUnit4ClassRunnerWithParametersFactory.class)
-public class TestS3ImportWithHadoopCredProvider extends TestImportWithHadoopCredProvider {
+public class TestS3ImportWithHadoopCredProvider extends AbstractTestImportWithHadoopCredProvider {
 
   @Parameterized.Parameters(name = "credentialProviderPathProperty = {0}")
   public static Iterable<? extends Object> parameters() {
@@ -44,7 +44,7 @@ public static Iterable<? extends Object> parameters() {
   public static S3CredentialsRule s3CredentialsRule = new S3CredentialsRule();
 
   static {
-    TestImportWithHadoopCredProvider.credentialsRule = s3CredentialsRule;
+    AbstractTestImportWithHadoopCredProvider.credentialsRule = s3CredentialsRule;
   }
 
   public TestS3ImportWithHadoopCredProvider(String credentialProviderPathProperty) {
diff --git a/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalAppendAvroImport.java b/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalAppendAvroImport.java
index 97fca595..1994e806 100644
--- a/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalAppendAvroImport.java
+++ b/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalAppendAvroImport.java
@@ -18,13 +18,13 @@
 
 package org.apache.sqoop.cloud.s3;
 
-import org.apache.sqoop.cloud.TestIncrementalAppendAvroImport;
+import org.apache.sqoop.cloud.AbstractTestIncrementalAppendAvroImport;
 import org.apache.sqoop.testcategories.thirdpartytest.S3Test;
 import org.junit.ClassRule;
 import org.junit.experimental.categories.Category;
 
 @Category(S3Test.class)
-public class TestS3IncrementalAppendAvroImport extends TestIncrementalAppendAvroImport {
+public class TestS3IncrementalAppendAvroImport extends AbstractTestIncrementalAppendAvroImport {
 
   @ClassRule
   public static S3CredentialsRule credentialsRule = new S3CredentialsRule();
diff --git a/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalAppendParquetImport.java b/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalAppendParquetImport.java
index 23f9e61a..7d161f3d 100644
--- a/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalAppendParquetImport.java
+++ b/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalAppendParquetImport.java
@@ -18,13 +18,13 @@
 
 package org.apache.sqoop.cloud.s3;
 
-import org.apache.sqoop.cloud.TestIncrementalAppendParquetImport;
+import org.apache.sqoop.cloud.AbstractTestIncrementalAppendParquetImport;
 import org.apache.sqoop.testcategories.thirdpartytest.S3Test;
 import org.junit.ClassRule;
 import org.junit.experimental.categories.Category;
 
 @Category(S3Test.class)
-public class TestS3IncrementalAppendParquetImport extends TestIncrementalAppendParquetImport {
+public class TestS3IncrementalAppendParquetImport extends AbstractTestIncrementalAppendParquetImport {
 
   @ClassRule
   public static S3CredentialsRule credentialsRule = new S3CredentialsRule();
diff --git a/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalAppendSequenceFileImport.java b/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalAppendSequenceFileImport.java
index 164a8a64..73542f32 100644
--- a/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalAppendSequenceFileImport.java
+++ b/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalAppendSequenceFileImport.java
@@ -18,13 +18,13 @@
 
 package org.apache.sqoop.cloud.s3;
 
-import org.apache.sqoop.cloud.TestIncrementalAppendSequenceFileImport;
+import org.apache.sqoop.cloud.AbstractTestIncrementalAppendSequenceFileImport;
 import org.apache.sqoop.testcategories.thirdpartytest.S3Test;
 import org.junit.ClassRule;
 import org.junit.experimental.categories.Category;
 
 @Category(S3Test.class)
-public class TestS3IncrementalAppendSequenceFileImport extends TestIncrementalAppendSequenceFileImport {
+public class TestS3IncrementalAppendSequenceFileImport extends AbstractTestIncrementalAppendSequenceFileImport {
 
   @ClassRule
   public static S3CredentialsRule credentialsRule = new S3CredentialsRule();
diff --git a/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalAppendTextImport.java b/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalAppendTextImport.java
index d55481e4..18d344c5 100644
--- a/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalAppendTextImport.java
+++ b/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalAppendTextImport.java
@@ -18,13 +18,13 @@
 
 package org.apache.sqoop.cloud.s3;
 
-import org.apache.sqoop.cloud.TestIncrementalAppendTextImport;
+import org.apache.sqoop.cloud.AbstractTestIncrementalAppendTextImport;
 import org.apache.sqoop.testcategories.thirdpartytest.S3Test;
 import org.junit.ClassRule;
 import org.junit.experimental.categories.Category;
 
 @Category(S3Test.class)
-public class TestS3IncrementalAppendTextImport extends TestIncrementalAppendTextImport {
+public class TestS3IncrementalAppendTextImport extends AbstractTestIncrementalAppendTextImport {
 
   @ClassRule
   public static S3CredentialsRule credentialsRule = new S3CredentialsRule();
diff --git a/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalMergeParquetImport.java b/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalMergeParquetImport.java
index e05dd213..7710246b 100644
--- a/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalMergeParquetImport.java
+++ b/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalMergeParquetImport.java
@@ -18,13 +18,13 @@
 
 package org.apache.sqoop.cloud.s3;
 
-import org.apache.sqoop.cloud.TestIncrementalMergeParquetImport;
+import org.apache.sqoop.cloud.AbstractTestIncrementalMergeParquetImport;
 import org.apache.sqoop.testcategories.thirdpartytest.S3Test;
 import org.junit.ClassRule;
 import org.junit.experimental.categories.Category;
 
 @Category(S3Test.class)
-public class TestS3IncrementalMergeParquetImport extends TestIncrementalMergeParquetImport {
+public class TestS3IncrementalMergeParquetImport extends AbstractTestIncrementalMergeParquetImport {
 
   @ClassRule
   public static S3CredentialsRule credentialsRule = new S3CredentialsRule();
diff --git a/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalMergeTextImport.java b/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalMergeTextImport.java
index 63ea3635..92a6ad0c 100644
--- a/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalMergeTextImport.java
+++ b/src/test/org/apache/sqoop/cloud/s3/TestS3IncrementalMergeTextImport.java
@@ -18,13 +18,13 @@
 
 package org.apache.sqoop.cloud.s3;
 
-import org.apache.sqoop.cloud.TestIncrementalMergeTextImport;
+import org.apache.sqoop.cloud.AbstractTestIncrementalMergeTextImport;
 import org.apache.sqoop.testcategories.thirdpartytest.S3Test;
 import org.junit.ClassRule;
 import org.junit.experimental.categories.Category;
 
 @Category(S3Test.class)
-public class TestS3IncrementalMergeTextImport extends TestIncrementalMergeTextImport {
+public class TestS3IncrementalMergeTextImport extends AbstractTestIncrementalMergeTextImport {
 
   @ClassRule
   public static S3CredentialsRule credentialsRule = new S3CredentialsRule();
diff --git a/src/test/org/apache/sqoop/cloud/s3/TestS3ParquetImport.java b/src/test/org/apache/sqoop/cloud/s3/TestS3ParquetImport.java
index 958e3ea5..c7d8950a 100644
--- a/src/test/org/apache/sqoop/cloud/s3/TestS3ParquetImport.java
+++ b/src/test/org/apache/sqoop/cloud/s3/TestS3ParquetImport.java
@@ -18,13 +18,13 @@
 
 package org.apache.sqoop.cloud.s3;
 
-import org.apache.sqoop.cloud.TestParquetImport;
+import org.apache.sqoop.cloud.AbstractTestParquetImport;
 import org.apache.sqoop.testcategories.thirdpartytest.S3Test;
 import org.junit.ClassRule;
 import org.junit.experimental.categories.Category;
 
 @Category(S3Test.class)
-public class TestS3ParquetImport extends TestParquetImport {
+public class TestS3ParquetImport extends AbstractTestParquetImport {
 
   @ClassRule
   public static S3CredentialsRule credentialsRule = new S3CredentialsRule();
diff --git a/src/test/org/apache/sqoop/cloud/s3/TestS3SequenceFileImport.java b/src/test/org/apache/sqoop/cloud/s3/TestS3SequenceFileImport.java
index 67a05972..8a9df22d 100644
--- a/src/test/org/apache/sqoop/cloud/s3/TestS3SequenceFileImport.java
+++ b/src/test/org/apache/sqoop/cloud/s3/TestS3SequenceFileImport.java
@@ -18,13 +18,13 @@
 
 package org.apache.sqoop.cloud.s3;
 
-import org.apache.sqoop.cloud.TestSequenceFileImport;
+import org.apache.sqoop.cloud.AbstractTestSequenceFileImport;
 import org.apache.sqoop.testcategories.thirdpartytest.S3Test;
 import org.junit.ClassRule;
 import org.junit.experimental.categories.Category;
 
 @Category(S3Test.class)
-public class TestS3SequenceFileImport extends TestSequenceFileImport {
+public class TestS3SequenceFileImport extends AbstractTestSequenceFileImport {
 
   @ClassRule
   public static S3CredentialsRule credentialsRule = new S3CredentialsRule();
diff --git a/src/test/org/apache/sqoop/cloud/s3/TestS3TextImport.java b/src/test/org/apache/sqoop/cloud/s3/TestS3TextImport.java
index 25a8f4e7..5446a8ce 100644
--- a/src/test/org/apache/sqoop/cloud/s3/TestS3TextImport.java
+++ b/src/test/org/apache/sqoop/cloud/s3/TestS3TextImport.java
@@ -18,13 +18,13 @@
 
 package org.apache.sqoop.cloud.s3;
 
-import org.apache.sqoop.cloud.TestTextImport;
+import org.apache.sqoop.cloud.AbstractTestTextImport;
 import org.apache.sqoop.testcategories.thirdpartytest.S3Test;
 import org.junit.ClassRule;
 import org.junit.experimental.categories.Category;
 
 @Category(S3Test.class)
-public class TestS3TextImport extends TestTextImport {
+public class TestS3TextImport extends AbstractTestTextImport {
 
   @ClassRule
   public static S3CredentialsRule credentialsRule = new S3CredentialsRule();