Index: oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java
===================================================================
--- oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java	(revision 1678141)
+++ oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java	(working copy)
@@ -21,7 +21,6 @@
 import java.util.regex.Pattern;
 
 import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.BaseTokenStreamTestCase;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.core.KeywordTokenizer;
@@ -31,18 +30,19 @@
 import org.apache.lucene.analysis.pattern.PatternCaptureGroupTokenFilter;
 import org.apache.lucene.analysis.pattern.PatternReplaceFilter;
 import org.apache.lucene.analysis.reverse.ReverseStringFilter;
-import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util.Version;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertAnalyzesTo;
+import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
+
 /**
  * Testcase for checking default analyzers configurations behave as expected with regards to path related restrictions
  *
  * Note that default Solr analyzers for Oak should be equivalent to the ones programmatically defined here.
  */
-@LuceneTestCase.SuppressCodecs({"Lucene3x"})
-public class DefaultAnalyzersConfigurationTest extends BaseTokenStreamTestCase {
+public class DefaultAnalyzersConfigurationTest {
 
     private Analyzer parentPathIndexingAnalyzer;
     private Analyzer parentPathSearchingAnalyzer;
@@ -54,7 +54,6 @@
 
     @Before
     public void setUp() throws Exception {
-        super.setUp();
         this.exactPathAnalyzer = new Analyzer() {
             @Override
             protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
Index: oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/util/NodeTypeIndexingUtilsTest.java
===================================================================
--- oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/util/NodeTypeIndexingUtilsTest.java	(revision 1678141)
+++ oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/util/NodeTypeIndexingUtilsTest.java	(working copy)
@@ -18,18 +18,48 @@
 
 import java.io.File;
 
-import org.apache.jackrabbit.core.query.AbstractQueryTest;
-import org.apache.jackrabbit.oak.plugins.index.solr.util.NodeTypeIndexingUtils;
+import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+
+import org.apache.jackrabbit.api.JackrabbitRepository;
+import org.apache.jackrabbit.oak.jcr.Jcr;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Testcase for {@link org.apache.jackrabbit.oak.plugins.index.solr.util.NodeTypeIndexingUtils}
  */
-public class NodeTypeIndexingUtilsTest extends AbstractQueryTest {
+public class NodeTypeIndexingUtilsTest {
 
+    private Repository r;
+    private Session s;
+
+    @Before
+    public void setUp() throws RepositoryException {
+        r = new Jcr().createRepository();
+        s = r.login(new SimpleCredentials("admin", "admin".toCharArray()));
+    }
+
+    @After
+    public void tearDown() {
+        s.logout();
+        s = null;
+        if (r instanceof JackrabbitRepository) {
+            ((JackrabbitRepository) r).shutdown();
+        }
+        r = null;
+    }
+
+    @Test
     public void testSynonymsFileCreation() throws Exception {
         File synonymsFile = NodeTypeIndexingUtils.createPrimaryTypeSynonymsFile(getClass().getResource("/").getFile() +
-                "/pt-synonyms.txt", superuser);
+                "/pt-synonyms.txt", s);
         assertNotNull(synonymsFile);
         assertTrue(synonymsFile.exists());
     }