diff --git a/core/build.gradle b/core/build.gradle
index 53f266b42..3799a7161 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -10,7 +10,7 @@ def screenshotsDir = "${project.buildDir}/screenshots"
 def screenshotsForGoldensDir = "${project.buildDir}/screenshots_for_goldens"
 def newGoldensDir = "${project.buildDir}/new_golden_images"
 def goldensDir =
-  "${project.ext.javaTestDir}/google/registry/webdriver/goldens/chrome-linux"
+  "${javaTestDir}/google/registry/webdriver/goldens/chrome-linux"
 
 // Tests that conflict with (mostly unidentified) members of the main test
 // suite. It is unclear if they are offenders (i.e., those that pollute global
@@ -309,10 +309,10 @@ dependencies {
 }
 
 task jaxbToJava {
-  def xsdFilesDir = "${project.ext.javaDir}/google/registry/xml/xsd"
-  def bindingsFile = "${project.ext.javaDir}/google/registry/xjc/bindings.xjb"
-  def pkgInfoGenerator = "${project.ext.javaDir}/google/registry/xjc/make_pkginfo.sh"
-  def pkgInfoTemplate = "${project.ext.javaDir}/google/registry/xjc/package-info.java.in"
+  def xsdFilesDir = "${javaDir}/google/registry/xml/xsd"
+  def bindingsFile = "${javaDir}/google/registry/xjc/bindings.xjb"
+  def pkgInfoGenerator = "${javaDir}/google/registry/xjc/make_pkginfo.sh"
+  def pkgInfoTemplate = "${javaDir}/google/registry/xjc/package-info.java.in"
   def outputDir = "${generatedDir}/google/registry/xjc"
 
   inputs.dir xsdFilesDir
@@ -374,7 +374,7 @@ task soyToJava {
           spec11SoyDir, toolsSoyDir, uiSoyDir, registrarSoyDir,
   ]
   soyRelativeDirs.each {
-    inputs.dir "${project.ext.javaDir}/${it}"
+    inputs.dir "${javaDir}/${it}"
     outputs.dir "${generatedDir}/${it}"
   }
 
@@ -394,19 +394,19 @@ task soyToJava {
     soyToJava('google.registry.tools.soy',
             "${generatedDir}/${toolsSoyDir}",
             fileTree(
-                    dir: "${project.ext.javaDir}/${toolsSoyDir}",
+                    dir: "${javaDir}/${toolsSoyDir}",
                     include: ['**/*.soy']))
 
     soyToJava('google.registry.ui.soy.registrar',
             "${generatedDir}/${registrarSoyDir}",
             fileTree(
-                    dir: "${project.ext.javaDir}/${registrarSoyDir}",
+                    dir: "${javaDir}/${registrarSoyDir}",
                     include: ['**/*.soy']))
 
     soyToJava('google.registry.ui.soy',
             "${generatedDir}/${uiSoyDir}",
             files {
-              file("${project.ext.javaDir}/${uiSoyDir}").listFiles()
+              file("${javaDir}/${uiSoyDir}").listFiles()
             }.filter {
               it.name.endsWith(".soy")
             })
@@ -414,13 +414,13 @@ task soyToJava {
     soyToJava('google.registry.reporting.spec11.soy',
             "${generatedDir}/${spec11SoyDir}",
             fileTree(
-                    dir: "${project.ext.javaDir}/${spec11SoyDir}",
+                    dir: "${javaDir}/${spec11SoyDir}",
                     include: ['**/*.soy']))
   }
 }
 
 task soyToJS {
-  def rootSoyDirectory = "${project.ext.javaDir}/google/registry/ui/soy"
+  def rootSoyDirectory = "${javaDir}/google/registry/ui/soy"
   def outputSoyDirectory = "${generatedDir}/google/registry/ui/soy"
   inputs.dir rootSoyDirectory
   outputs.dir outputSoyDirectory
@@ -434,7 +434,7 @@ task soyToJS {
           "--allowExternalCalls", "false",
           "--srcs", "${soyFiles.join(',')}",
           "--shouldProvideRequireSoyNamespaces", "true",
-          "--compileTimeGlobalsFile", "${project.ext.javaDir}/google/registry/ui/globals.txt",
+          "--compileTimeGlobalsFile", "${javaDir}/google/registry/ui/globals.txt",
           "--deps", "${deps.join(',')}"
     }
   }
@@ -456,7 +456,7 @@ task soyToJS {
 }
 
 task stylesheetsToJavascript {
-  def cssSourceDir = "${project.ext.javaDir}/google/registry/ui/css"
+  def cssSourceDir = "${javaDir}/google/registry/ui/css"
   def outputDir = "${resourcesDir}/google/registry/ui/css"
   inputs.dir cssSourceDir
   outputs.dir outputDir
@@ -509,8 +509,8 @@ task compileProdJS(type: JavaExec) {
   def outputDir = "${resourcesDir}/google/registry/ui"
   def nodeModulesDir = "${rootDir}/node_modules"
   def cssSourceDir = "${resourcesDir}/google/registry/ui/css"
-  def jsSourceDir = "${project.ext.javaDir}/google/registry/ui/js"
-  def externsDir = "${project.ext.javaDir}/google/registry/ui/externs"
+  def jsSourceDir = "${javaDir}/google/registry/ui/js"
+  def externsDir = "${javaDir}/google/registry/ui/externs"
   def soySourceDir = "${generatedDir}/google/registry/ui/soy"
 
   [nodeModulesDir, cssSourceDir, jsSourceDir, externsDir, soySourceDir].each {
diff --git a/proxy/build.gradle b/proxy/build.gradle
index 91605e6bf..4f971fa32 100644
--- a/proxy/build.gradle
+++ b/proxy/build.gradle
@@ -3,8 +3,8 @@ apply plugin: 'java'
 sourceSets {
   main {
     resources {
-      exclude "${project.ext.javaDir}/terraform/"
-      exclude "${project.ext.javaDir}/kubernetes/"
+      exclude "${javaDir}/terraform/"
+      exclude "${javaDir}/kubernetes/"
     }
   }
 }
diff --git a/proxy/src/main/java/google/registry/proxy/resources/hello.xml b/proxy/src/test/java/google/registry/proxy/testdata/hello.xml
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/resources/hello.xml
rename to proxy/src/test/java/google/registry/proxy/testdata/hello.xml