diff --git a/.gitignore b/.gitignore
index 86cb42d..582f1a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 build/
+buildSrc/out/
 .idea/
+r8.iml
 .gradle/
 android-data*/
 tests/2016-12-19/art.tar.gz
diff --git a/build.gradle b/build.gradle
index c351aca..8a5830d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,17 @@
 apply plugin: 'net.ltgt.errorprone-base'
 apply plugin: "net.ltgt.apt"
 
+// Ensure importing into IntelliJ IDEA use the same output directories as Gradle. In tests we
+// use the output path for tests (ultimately through ToolHelper.getClassPathForTests()) and
+// therefore these paths need to be the same. See https://youtrack.jetbrains.com/issue/IDEA-175172
+// for context.
+idea {
+    module {
+        outputDir file('build/classes/main')
+        testOutputDir file('build/classes/test')
+    }
+}
+
 def errorProneConfiguration = [
     '-XepDisableAllChecks',
     // D8 want to use reference equality, thus disable the checker explicitly