diff --git a/buildjdk.sh b/buildjdk.sh
index e2a67f6..f35e93a 100755
--- a/buildjdk.sh
+++ b/buildjdk.sh
@@ -5,15 +5,6 @@ set -e
 if [ "$TARGET_JDK" == "arm" ]
 then
   export TARGET_JDK=aarch32
-  if [ -z "$JVM_VARIANTS"]
-  then
-    export JVM_VARIANTS=client
-  fi
-else
-  if [ -z "$JVM_VARIANTS"]
-  then
-    export JVM_VARIANTS=server
-  fi
 fi
 
 sudo apt -y install systemtap-sdt-dev gcc-multilib g++-multilib libxtst-dev libasound2-dev libelf-dev libfontconfig1-dev libx11-dev
diff --git a/setdevkitpath.sh b/setdevkitpath.sh
index 9fabc5a..a5e7a67 100644
--- a/setdevkitpath.sh
+++ b/setdevkitpath.sh
@@ -19,6 +19,19 @@ else
   export TARGET_SHORT=$TARGET_JDK
 fi
 
+if [ "$TARGET_JDK" == "aarch32" ]
+then
+  if [ -z "$JVM_VARIANTS"]
+  then
+    export JVM_VARIANTS=client
+  fi
+else
+  if [ -z "$JVM_VARIANTS"]
+  then
+    export JVM_VARIANTS=server
+  fi
+fi
+
 # Set NDK
 export API=21
 export NDK=`pwd`/android-ndk-$NDK_VERSION