diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 947a06e0f1b5..d44e041e1a62 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -72,7 +72,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     package \
     padmin \
     psprint_config \
-    qadevOOo \
     regexp \
     reportdesign \
     sal \
@@ -117,6 +116,14 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     xmlscript \
 ))
 
+ifneq ($(SOLAR_JAVA),)
+ ifneq "$(OOO_JUNIT_JAR)" ""
+$(eval $(call gb_Module_add_moduledirs,ooo,\
+    qadevOOo \
+))
+  endif
+endif
+
 # these have only migrated subsequentcheck for now
 $(eval $(call gb_Module_add_moduledirs,ooo,\
     ucb \