diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4482ac9d..ace639ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,6 +138,13 @@ if (BUILDSWIGNODE)
   find_package (Node REQUIRED)
 endif (BUILDSWIGNODE)
 
+# Find JAVA/JNI
+if (BUILDSWIGJAVA)
+  find_package (Java REQUIRED)
+  find_package (JNI REQUIRED)
+  pkg_check_modules (MRAAJAVA REQUIRED mraajava>=0.8.0)
+endif (BUILDSWIGJAVA)
+
 # Find swig if any wrapper is enabled
 if (BUILDSWIGPYTHON OR BUILDSWIGNODE OR BUILDSWIGJAVA)
   find_package (SWIG 3.0.5 REQUIRED)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 560584ae..42007fe3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -221,9 +221,6 @@ endmacro(upm_swig_node)
 macro(upm_swig_java)
   # Skip if the libname is in the blacklist
   if (NOT ";${JAVASWIG_BLACKLIST};" MATCHES ";${libname};")
-    FIND_PACKAGE (JNI REQUIRED)
-    pkg_check_modules (MRAAJAVA REQUIRED mraajava>=0.8.0)
-
     include_directories (
       ${JAVA_INCLUDE_PATH}
       ${JAVA_INCLUDE_PATH2}