diff --git a/build.gradle b/build.gradle
index 712e8b5837c..49189482e6b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -192,4 +192,10 @@ allprojects {
   tasks.eclipse.dependsOn(copyEclipseSettings)
 }
 
+// add buildSrc itself as a groovy project
+task buildSrcEclipse(type: GradleBuild) {
+  buildFile = 'buildSrc/build.gradle'
+  tasks = ['cleanEclipse', 'eclipse']
+}
+tasks.eclipse.dependsOn(buildSrcEclipse)
 
diff --git a/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/TestReportLogger.groovy b/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/TestReportLogger.groovy
index 36d83a19865..147a26db86e 100644
--- a/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/TestReportLogger.groovy
+++ b/buildSrc/src/main/groovy/com/carrotsearch/gradle/junit4/TestReportLogger.groovy
@@ -25,7 +25,7 @@ class TestReportLogger extends TestsSummaryEventListener implements AggregatedEv
     static final String FAILURE_MARKER = " <<< FAILURES!"
 
     /** Status names column. */
-    static EnumMap<TestStatus, String> statusNames;
+    static EnumMap<? extends TestStatus, String> statusNames;
     static {
         statusNames = new EnumMap<>(TestStatus.class);
         for (TestStatus s : TestStatus.values()) {