diff --git a/testdefs.sh b/testdefs.sh
index a510f496..3799e2d6 100644
--- a/testdefs.sh
+++ b/testdefs.sh
@@ -35,6 +35,8 @@ else
    exit 1
 fi
 
+source "$servald_build_root/testconfig.sh"
+
 export PATH="$servald_build_root:$PATH"
 export TFW_LOGDIR="${SERVAL_TEST_LOGDIR:-$servald_build_root/testlog}"
 
diff --git a/testdefs_java.sh b/testdefs_java.sh
index e587b0dc..e10feeb6 100644
--- a/testdefs_java.sh
+++ b/testdefs_java.sh
@@ -22,8 +22,6 @@ java_build_root="$java_source_root"
 java_classdir="$java_build_root/java-api/classes"
 java_testclassdir="$java_build_root/java-api/testclasses"
 
-source "$java_build_root/testconfig.sh"
-
 # Utility function for setting up servald JNI fixtures:
 #  - check that libservaldaemon.so is present
 #  - set LD_LIBRARY_PATH so that libservaldaemon.so can be found