diff --git a/packaging/centos63/cloud-usage.rc b/packaging/centos63/cloud-usage.rc
index a03df5be5f6..9e3d6d6b2a8 100755
--- a/packaging/centos63/cloud-usage.rc
+++ b/packaging/centos63/cloud-usage.rc
@@ -52,12 +52,12 @@ setJavaHome() {
     return
   fi
 
-  # try javac first
-  java=$(which javac 2>/dev/null || :)
+  # try java first
+  java=$(which java 2>/dev/null || :)
 
-  # try java if javac is not found
+  # try javac if java is not found
   if [ -z "$java" ] ; then
-    java=$(which java 2>/dev/null || :)
+    java=$(which javac 2>/dev/null || :)
   fi
 
   if [ -n "$java" ] ; then
diff --git a/packaging/debian/init/cloud-usage b/packaging/debian/init/cloud-usage
index fcede4fc139..d1939180093 100755
--- a/packaging/debian/init/cloud-usage
+++ b/packaging/debian/init/cloud-usage
@@ -48,12 +48,12 @@ setJavaHome() {
     return
   fi
 
-  # try javac first
-  java=$(which javac 2>/dev/null || :)
+  # try java first
+  java=$(which java 2>/dev/null || :)
 
-  # try java if javac is not found
+  # try javac if java is not found
   if [ -z "$java" ] ; then
-    java=$(which java 2>/dev/null || :)
+    java=$(which javac 2>/dev/null || :)
   fi
 
   if [ -n "$java" ] ; then