diff --git a/plugins/org.eclipse.xtext/build.gradle b/plugins/org.eclipse.xtext/build.gradle
index 2e2d7de6e..68e8e97c1 100644
--- a/plugins/org.eclipse.xtext/build.gradle
+++ b/plugins/org.eclipse.xtext/build.gradle
@@ -18,7 +18,6 @@ dependencies {
 
 sourceSets.main {
 	java.srcDir 'packrat'
-	resources.exclude 'packrat'
 }
 
 jar {
diff --git a/separate-builds/core/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/AbstractLanguageServerTest.xtend b/separate-builds/core/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/AbstractLanguageServerTest.xtend
index cf2a8f02d..f49000ad7 100644
--- a/separate-builds/core/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/AbstractLanguageServerTest.xtend
+++ b/separate-builds/core/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/AbstractLanguageServerTest.xtend
@@ -42,10 +42,9 @@ import org.eclipse.xtext.resource.IResourceServiceProvider
 import org.eclipse.xtext.util.CancelIndicator
 import org.eclipse.xtext.util.Files
 import org.eclipse.xtext.util.Modules2
+import org.junit.Assert
 import org.junit.Before
 
-import static org.junit.Assert.*
-
 import static extension io.typefox.lsapi.util.LsapiFactories.*
 
 /**
@@ -207,7 +206,7 @@ abstract class AbstractLanguageServerTest implements Consumer<PublishDiagnostics
         val actualCompletionItems = completionItems.get.items.toExpectation
         assertEquals(expectedCompletionItems, actualCompletionItems)
     }
-
+    
     protected def void testDefinition((DefinitionTestConfiguration)=>void configurator) {
         val extension configuration = new DefinitionTestConfiguration
         configuration.filePath = 'MyModel.' + fileExtension
@@ -282,6 +281,10 @@ abstract class AbstractLanguageServerTest implements Consumer<PublishDiagnostics
         val actualDefinitions = definitions.get.toExpectation
         assertEquals(expectedReferences, actualDefinitions)
     }
+    
+    def void assertEquals(String expected, String actual) {
+        Assert.assertEquals(expected.replace('\t','    '), actual)
+    }
 
 }