diff --git a/java/hadoop/pom.xml b/java/hadoop/pom.xml
index 3d21d204afd..5be7992b642 100644
--- a/java/hadoop/pom.xml
+++ b/java/hadoop/pom.xml
@@ -81,7 +81,6 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.22.1</version>
         <configuration>
-          <!-- <argLine>${surefireArgLine}</argLine> -->
 		  <useManifestOnlyJar>false</useManifestOnlyJar>
 		  <useSystemClassLoader>true</useSystemClassLoader>
         </configuration>
@@ -89,7 +88,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.19.1</version>
+        <version>2.22.1</version>
         <executions>
           <execution>
             <goals>
@@ -99,6 +98,8 @@
           </execution>
         </executions>
         <configuration>
+		  <useManifestOnlyJar>false</useManifestOnlyJar>
+		  <useSystemClassLoader>true</useSystemClassLoader>
           <systemPropertyVariables>
             <vitess.client.testEnv>io.vitess.client.TestEnv</vitess.client.testEnv>
             <vitess.client.testEnv.portName>grpc_port</vitess.client.testEnv.portName>
diff --git a/java/pom.xml b/java/pom.xml
index a583c1835f0..3525af69f08 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -16,8 +16,8 @@
   <modules>
     <module>client</module>
     <module>example</module>
-    <module>grpc-client</module>
-    <!-- <module>hadoop</module> -->
+    <module>grpc-client</module> 
+    <module>hadoop</module>
     <module>jdbc</module>
   </modules>