diff --git a/dev/deps/spark-deps-hadoop-3.2-hive-2.3 b/dev/deps/spark-deps-hadoop-3.2-hive-2.3
index 698a03c4a4e02..5ab27495815f2 100644
--- a/dev/deps/spark-deps-hadoop-3.2-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-3.2-hive-2.3
@@ -60,10 +60,10 @@ flatbuffers-java/1.9.0//flatbuffers-java-1.9.0.jar
 generex/1.0.2//generex-1.0.2.jar
 gson/2.2.4//gson-2.2.4.jar
 guava/14.0.1//guava-14.0.1.jar
-hadoop-client-api/3.3.1//hadoop-client-api-3.3.1.jar
-hadoop-client-runtime/3.3.1//hadoop-client-runtime-3.3.1.jar
-hadoop-shaded-guava/1.1.1//hadoop-shaded-guava-1.1.1.jar
-hadoop-yarn-server-web-proxy/3.3.1//hadoop-yarn-server-web-proxy-3.3.1.jar
+hadoop-annotations/3.1.4//hadoop-annotations-3.1.4.jar
+hadoop-client-api/3.1.4//hadoop-client-api-3.1.4.jar
+hadoop-client-runtime/3.1.4//hadoop-client-runtime-3.1.4.jar
+hadoop-yarn-server-web-proxy/3.1.4//hadoop-yarn-server-web-proxy-3.1.4.jar
 hive-beeline/2.3.9//hive-beeline-2.3.9.jar
 hive-cli/2.3.9//hive-cli-2.3.9.jar
 hive-common/2.3.9//hive-common-2.3.9.jar
diff --git a/dev/run-tests.py b/dev/run-tests.py
index 0f0759bd328e8..109a69b2d8bc5 100755
--- a/dev/run-tests.py
+++ b/dev/run-tests.py
@@ -333,8 +333,8 @@ def get_hadoop_profiles(hadoop_version):
     """
 
     sbt_maven_hadoop_profiles = {
-        "hadoop2.7": ["-Phadoop-2.7"],
-        "hadoop3.2": ["-Phadoop-3.2"],
+        "hadoop2.7": ["-Phadoop-2.7 -Pno-shaded-hadoop-client"],
+        "hadoop3.2": ["-Phadoop-3.2 -Dhadoop.version=3.1.4 -Pno-shaded-hadoop-client"],
     }
 
     if hadoop_version in sbt_maven_hadoop_profiles:
diff --git a/pom.xml b/pom.xml
index 0d283063d7e32..1b7a75751f977 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,7 @@
     <sbt.project.name>spark</sbt.project.name>
     <slf4j.version>1.7.30</slf4j.version>
     <log4j.version>1.2.17</log4j.version>
-    <hadoop.version>3.3.1</hadoop.version>
+    <hadoop.version>3.1.4</hadoop.version>
     <protobuf.version>2.5.0</protobuf.version>
     <yarn.version>${hadoop.version}</yarn.version>
     <zookeeper.version>3.6.2</zookeeper.version>
@@ -3313,6 +3313,15 @@
       </modules>
     </profile>
 
+    <profile>
+      <id>no-shaded-hadoop-client</id>
+      <properties>
+        <hadoop-client-api.artifact>hadoop-client</hadoop-client-api.artifact>
+        <hadoop-client-runtime.artifact>hadoop-client</hadoop-client-runtime.artifact>
+        <hadoop-client-minicluster.artifact>hadoop-client</hadoop-client-minicluster.artifact>
+      </properties>
+    </profile>
+
     <!-- generally not enabled for automated builds, but will run k8s tests -->
     <profile>
       <id>kubernetes-integration-tests</id>
diff --git a/resource-managers/yarn/pom.xml b/resource-managers/yarn/pom.xml
index d6f7eabf988d9..efcd254e19cde 100644
--- a/resource-managers/yarn/pom.xml
+++ b/resource-managers/yarn/pom.xml
@@ -76,6 +76,38 @@
         </dependency>
       </dependencies>
     </profile>
+    <profile>
+      <id>no-shaded-hadoop-client</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-yarn-api</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-yarn-common</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-yarn-server-web-proxy</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-yarn-client</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-yarn-server-tests</artifactId>
+          <classifier>tests</classifier>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
     <profile>
       <id>hadoop-3.2</id>
       <activation>