diff --git a/make/Makefile b/make/Makefile
index 82d1169..405e3ff 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -52,13 +52,16 @@ clean:
 
 sanity:
 	@echo "JDKHOME               = $(JDKHOME)"
-	@echo "JUNIT_JAR             = $(JUNIT_JAR)"
-	@echo "JAVADIFFUTILS_JAR     = $(JAVADIFFUTILS_JAR)"
-	@echo "JAVADIFFUTILS_LICENSE = $(JAVADIFFUTILS_LICENSE)"
 	@echo "DAISYDIFF_JAR         = $(DAISYDIFF_JAR)"
+	@echo "DAISYDIFF_SRC         = $(DAISYDIFF_SRC)"
 	@echo "DAISYDIFF_LICENSE     = $(DAISYDIFF_LICENSE)"
+	@echo "EQUINOX_JAR           = $(EQUINOX_JAR)"
+	@echo "EQUINOX_LICENSE       = $(EQUINOX_LICENSE)"
 	@echo "HTMLCLEANER_JAR       = $(HTMLCLEANER_JAR)"
 	@echo "HTMLCLEANER_LICENSE   = $(HTMLCLEANER_LICENSE)"
+	@echo "JAVADIFFUTILS_JAR     = $(JAVADIFFUTILS_JAR)"
+	@echo "JAVADIFFUTILS_LICENSE = $(JAVADIFFUTILS_LICENSE)"
+	@echo "JUNIT_JAR             = $(JUNIT_JAR)"
 
 check-build-vars:
 	@if [ -z "$(JDKHOME)" ]; then \
@@ -70,6 +73,12 @@ check-build-vars:
 	@if [ -z "$(DAISYDIFF_LICENSE)" ]; then \
 		echo "DAISYDIFF_LICENSE not set (will not be included)" ; \
 	fi
+	@if [ -z "$(EQUINOX_JAR)" ]; then \
+		echo "EQUINOX_JAR not set" ; exit 1 ; \
+	fi
+	@if [ -z "$(EQUINOX_LICENSE)" ]; then \
+		echo "EQUINOX_LICENSE not set (will not be included)" ; \
+	fi
 	@if [ -z "$(HTMLCLEANER_JAR)" ]; then \
 		echo "HTMLCLEANER_JAR not set" ; exit 1 ; \
 	fi
diff --git a/make/apidiff.gmk b/make/apidiff.gmk
index 0da6b60..c8b5dd3 100644
--- a/make/apidiff.gmk
+++ b/make/apidiff.gmk
@@ -33,11 +33,14 @@ JAVAFILES.jdk.codetools.apidiff := \
 ifneq ($(DAISYDIFF_SRC),)
 	DAISYDIFF_SRC_JAVA = $(DAISYDIFF_SRC)/main/java
 	DAISYDIFF_SRC_RESOURCES = $(DAISYDIFF_SRC)/main/resources
+	DAISYDIFF_CLASSPATH_ELEMENT = $(DAISYDIFF_SRC_JAVA)
+else
+	DAISYDIFF_CLASSPATH_ELEMENT = $(DAISYDIFF_JAR)
 endif
 
 $(BUILDDIR)/classes.jdk.codetools.apidiff.ok: $(JAVAFILES.jdk.codetools.apidiff)
 	$(JAVAC) $(JAVAC_OPTIONS) \
-		-cp $(JAVADIFFUTILS_JAR):$(DAISYDIFF_JAR):$(DAISYDIFF_SRC_JAVA):$(EQUINOX_JAR):$(HTMLCLEANER_JAR) \
+		-cp $(JAVADIFFUTILS_JAR):$(DAISYDIFF_CLASSPATH_ELEMENT):$(EQUINOX_JAR):$(HTMLCLEANER_JAR) \
 		-d $(CLASSDIR) \
 		$(JAVAFILES.jdk.codetools.apidiff)
 	echo "classes built at `date`" > $@
diff --git a/make/build-support/build-common.sh b/make/build-support/build-common.sh
index beb9962..bba569b 100644
--- a/make/build-support/build-common.sh
+++ b/make/build-support/build-common.sh
@@ -280,7 +280,8 @@ if [ -z "${log_module:-}" ]; then
     exit 1
 fi
 
-ROOT="$(abspath ${ROOT:-${mydir}/..})"
+DEFAULT_ROOT="$(builtin cd ${mydir}/..; pwd)"
+ROOT="$(abspath ${ROOT:-${DEFAULT_ROOT}})"
 BUILD_DIR="$(abspath "${BUILD_DIR:-${ROOT}/build}")"
 DEPS_DIR="${BUILD_DIR}/deps"
 
diff --git a/make/build.sh b/make/build.sh
index 417b01d..93ed9a2 100644
--- a/make/build.sh
+++ b/make/build.sh
@@ -665,22 +665,22 @@ cat > ${BUILD_DIR}/make.sh << EOF
 
 # Build apidiff
 cd "${ROOT}/make"
-make BUILDDIR="${BUILD_DIR}"                                  \\
-     BUILD_MILESTONE="${APIDIFF_BUILD_MILESTONE}"             \\
-     BUILD_NUMBER="${APIDIFF_BUILD_NUMBER}"                   \\
-     BUILD_VERSION="${APIDIFF_VERSION}"                       \\
-     BUILD_VERSION_STRING="${APIDIFF_VERSION_STRING}"         \\
-     DAISYDIFF_JAR="$(mixed_path "${DAISYDIFF_JAR:-}")"       \\
-     DAISYDIFF_SRC="$(mixed_path "${DAISYDIFF_SRC:-}")"       \\
-     DAISYDIFF_LICENSE="${DAISYDIFF_LICENSE}"                 \\
-     EQUINOX_JAR="$(mixed_path "${EQUINOX_JAR:-}")"           \\
-     EQUINOX_LICENSE="$(mixed_path "${EQUINOX_LICENSE:-}")"   \\
-     HTMLCLEANER_JAR="${HTMLCLEANER_JAR}"                     \\
-     HTMLCLEANER_LICENSE="${HTMLCLEANER_LICENSE}"             \\
-     JAVADIFFUTILS_JAR="$(mixed_path "${JAVADIFFUTILS_JAR}")" \\
-     JAVADIFFUTILS_LICENSE="${JAVADIFFUTILS_LICENSE}"         \\
-     JDKHOME="${JAVA_HOME}"                                   \\
-     JUNIT_JAR="$(mixed_path "${JUNIT_JAR}")"                 \\
+make BUILDDIR="${BUILD_DIR}"                                            \\
+     BUILD_MILESTONE="${APIDIFF_BUILD_MILESTONE}"                       \\
+     BUILD_NUMBER="${APIDIFF_BUILD_NUMBER}"                             \\
+     BUILD_VERSION="${APIDIFF_VERSION}"                                 \\
+     BUILD_VERSION_STRING="${APIDIFF_VERSION_STRING}"                   \\
+     DAISYDIFF_JAR="$(mixed_path "${DAISYDIFF_JAR:-}")"                 \\
+     DAISYDIFF_SRC="$(mixed_path "${DAISYDIFF_SRC:-}")"                 \\
+     DAISYDIFF_LICENSE="$(mixed_path "${DAISYDIFF_LICENSE:-}")"         \\
+     EQUINOX_JAR="$(mixed_path "${EQUINOX_JAR:-}")"                     \\
+     EQUINOX_LICENSE="$(mixed_path "${EQUINOX_LICENSE:-}")"             \\
+     HTMLCLEANER_JAR="$(mixed_path "${HTMLCLEANER_JAR:-}")"             \\
+     HTMLCLEANER_LICENSE="$(mixed_path "${HTMLCLEANER_LICENSE:-}")"     \\
+     JAVADIFFUTILS_JAR="$(mixed_path "${JAVADIFFUTILS_JAR}")"           \\
+     JAVADIFFUTILS_LICENSE="$(mixed_path "${JAVADIFFUTILS_LICENSE}")"   \\
+     JDKHOME="$(mixed_path ${JAVA_HOME})"                               \\
+     JUNIT_JAR="$(mixed_path "${JUNIT_JAR}")"                           \\
    "\$@"
 EOF
 
diff --git a/test/junit/JUnitTests.gmk b/test/junit/JUnitTests.gmk
index 04e02e6..87ae669 100644
--- a/test/junit/JUnitTests.gmk
+++ b/test/junit/JUnitTests.gmk
@@ -30,7 +30,11 @@ JUnitTest.add-exports =  \
 		--add-exports jdk.jdeps/com.sun.tools.classfile=ALL-UNNAMED
 
 JUnitTest.classpath = \
-		$(BUILDTESTDIR)/JUnitTests/classes:$(APIDIFF_IMAGEDIR)/lib/apidiff.jar:$(JAVADIFFUTILS_JAR):$(DAISYDIFF_JAR):$(HTMLCLEANER_JAR)
+		$(BUILDTESTDIR)/JUnitTests/classes:$(APIDIFF_IMAGEDIR)/lib/apidiff.jar:$(JAVADIFFUTILS_JAR):$(HTMLCLEANER_JAR):$(EQUINOX_JAR)
+
+ifneq ($(DAISYDIFF_JAR),)
+		JUnitTest.classpath += :$(DAISYDIFF_JAR)
+endif
 
 $(BUILDTESTDIR)/JUnitTests.ok: \
 		$(BUILDTESTDIR)/JUnitTests.classes.ok