diff --git a/Ghidra/Test/IntegrationTest/build.gradle b/Ghidra/Test/IntegrationTest/build.gradle
index 628c2f7e6c..c2c12dafcd 100644
--- a/Ghidra/Test/IntegrationTest/build.gradle
+++ b/Ghidra/Test/IntegrationTest/build.gradle
@@ -8,9 +8,7 @@ eclipse.project.name = '_Integration Test'
  * Build dependencies
  *********************************************************************************/
 dependencies {
-	// integration test module may depends on all other projects within this repo
-	def ghidraPath = projectDir.getParentFile().getParentFile().path.replace(File.separator, "/") + "/";
-
+	
 	rootProject.subprojects { p ->
 		p.plugins.withType(JavaPlugin) {
 			def projectPath = p.projectDir.path.replace(File.separator, "/")
@@ -29,8 +27,8 @@ dependencies {
 
 	// some tests use classes in Base/src/test and test.slow
 	testCompile project(path: ':Base', configuration: 'testArtifacts')
-	compile project(path: ':Base', configuration: 'integrationTestArtifacts')	
-	compile project(path: ':FunctionGraph', configuration: 'testArtifacts')
+	testCompile project(path: ':Base', configuration: 'integrationTestArtifacts')	
+	testCompile project(path: ':FunctionGraph', configuration: 'testArtifacts')
 }
 
 // For Java 9, we must explicitly export references to the internal classes we are using.
diff --git a/gradle/javaProject.gradle b/gradle/javaProject.gradle
index 265f061b26..e488a80fcf 100644
--- a/gradle/javaProject.gradle
+++ b/gradle/javaProject.gradle
@@ -79,6 +79,9 @@ sourceSets {
 	screenShots {
 		java {
 			srcDir 'src/screen/java'
+			
+			// Screenshots are essentially tests, and depend on classes in several other
+			// test directories so they must be included here
 			compileClasspath += main.output + test.output + integrationTest.output
 			runtimeClasspath += main.output + test.output + integrationTest.output
 		}