diff --git a/config_host.mk.in b/config_host.mk.in
index be1fd1b6d71d..f8566af96a0e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -58,7 +58,6 @@ export CFLAGS=@CFLAGS@
 endif
 export CHECK_PARALLELISM=@CHECK_PARALLELISM@
 export CLANGPLUGIN_CPPFLAGS=@CLANGPLUGIN_CPPFLAGS@
-export CLASSPATH=@CLASSPATH@
 export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@
 export CLUCENE_LIBS=@CLUCENE_LIBS@
 export CLUCENE_TARBALL=@CLUCENE_TARBALL@
@@ -693,7 +692,6 @@ export WPG_TARBALL=@WPG_TARBALL@
 export WPS_CFLAGS=@WPS_CFLAGS@
 export WPS_LIBS=@WPS_LIBS@
 export WPS_TARBALL=@WPS_TARBALL@
-export XCLASSPATH=@XCLASSPATH@
 export XINERAMA_LINK=@XINERAMA_LINK@
 export XMLLINT=@XMLLINT@
 export XRANDR_CFLAGS=@XRANDR_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 65e3c222d8d2..55bfb90c733e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6468,20 +6468,11 @@ if test "$SOLAR_JAVA" != ""; then
         test -d "$JRE_BASE_DIR/$JAVA_TOOLKIT" && JAVALIB="$JAVALIB -L$JRE_BASE_DIR/$JAVA_TOOLKIT"
         test -d "$JRE_BASE_DIR/native_thread" && JAVALIB="$JAVALIB -L$JRE_BASE_DIR/native_thread"
     fi
-
-    CLASSPATH=
-    if test "$JDK"!="gcj"; then
-        if test -f "$JAVA_HOME/jre/lib/rt.jar"; then
-            CLASSPATH="${JAVA_HOME}/jre/lib/rt.jar${P_SEP}."
-        fi
-    fi
-    XCLASSPATH="$CLASSPATH"
 else
     x_JAVALIB=[\#]
     x_JDKLIB=[\#]
 fi
 
-AC_SUBST(CLASSPATH)
 AC_SUBST(JAVALIB)
 AC_SUBST(JAVACOMPILER)
 AC_SUBST(JAVADOC)
@@ -6492,7 +6483,6 @@ AC_SUBST(JAVA_SOURCE_VER)
 AC_SUBST(JAVA_TARGET_VER)
 AC_SUBST(JDK)
 AC_SUBST(JDKLIB)
-AC_SUBST(XCLASSPATH)
 AC_SUBST(x_JAVALIB)
 AC_SUBST(x_JDKLIB)
 
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 4527fcfc0545..5d53511d6ca4 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -96,7 +96,6 @@ $(call gb_Jar_get_target,$(1)) : PACKAGEROOTS :=
 $(call gb_Jar_get_target,$(1)) : PACKAGEDIRS :=
 $(call gb_Jar_get_target,$(1)) : PACKAGEFILES :=
 $(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1)))
-$(call gb_JavaClassSet_add_classpath,$(call gb_Jar_get_classsetname,$(1)),$(value XCLASSPATH))
 $(eval $(call gb_Module_register_target,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_clean_target,$(1))))
 $(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_target,$(1)),$(1))
 $(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1))
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 8dbc1bfe0090..fbe87fd27c38 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -67,7 +67,7 @@ $(call gb_JunitTest_get_target,%) :
 	$(CLEAN_CMD)
 
 define gb_JunitTest_JunitTest
-$(call gb_JunitTest_get_target,$(1)) : T_CP := $(if $(value XCLASSPATH),$$(value XCLASSPATH)$$(gb_CLASSPATHSEP))$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(OUTDIR)/lib
+$(call gb_JunitTest_get_target,$(1)) : T_CP := $(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(OUTDIR)/lib
 $(call gb_JunitTest_get_target,$(1)) : CLASSES :=
 $(eval $(call gb_JunitTest_JunitTest_platform,$(1)))