diff --git a/tests/Solr4ServiceTest/Solr4ServiceTest_RecordingService.php b/tests/Solr4ServiceTest/Solr4ServiceTest_RecordingService.php
index 3fd0adc..480ab1b 100644
--- a/tests/Solr4ServiceTest/Solr4ServiceTest_RecordingService.php
+++ b/tests/Solr4ServiceTest/Solr4ServiceTest_RecordingService.php
@@ -2,7 +2,7 @@
 
 namespace SilverStripe\FullTextSearch\Tests\Solr4ServiceTest;
 
-use SilverStripe\FullTextSearch\Solr\Solr4Service_Core;
+use SilverStripe\FullTextSearch\Solr\Services\Solr4Service_Core;
 
 class Solr4ServiceTest_RecordingService extends Solr4Service_Core
 {
diff --git a/tests/SolrReindexQueuedTest.php b/tests/SolrReindexQueuedTest.php
index 3eb5c89..ed7aa0c 100644
--- a/tests/SolrReindexQueuedTest.php
+++ b/tests/SolrReindexQueuedTest.php
@@ -2,6 +2,9 @@
 
 use SilverStripe\Dev\SapphireTest;
 
+use SilverStripe\FullTextSearch\Search\FullTextSearch;
+use SilverStripe\FullTextSearch\Tests\SolrReindexTest\SolrReindexTest_Variant;
+
 /**
  * Additional tests of solr reindexing processes when run with queuedjobs
  */
diff --git a/tests/SolrReindexTest.php b/tests/SolrReindexTest.php
index a740edf..1c2c2a6 100644
--- a/tests/SolrReindexTest.php
+++ b/tests/SolrReindexTest.php
@@ -2,6 +2,9 @@
 
 use SilverStripe\Dev\SapphireTest;
 
+use SilverStripe\FullTextSearch\Search\FullTextSearch;
+use SilverStripe\FullTextSearch\Tests\SolrReindexTest\SolrReindexTest_Variant;
+
 if (class_exists('Phockito')) {
     Phockito::include_hamcrest(false);
 }
diff --git a/tests/SolrReindexTest/SolrReindexTest_ItemExtension.php b/tests/SolrReindexTest/SolrReindexTest_ItemExtension.php
index 8306d5d..9981932 100644
--- a/tests/SolrReindexTest/SolrReindexTest_ItemExtension.php
+++ b/tests/SolrReindexTest/SolrReindexTest_ItemExtension.php
@@ -4,6 +4,8 @@ namespace SilverStripe\FullTextSearch\Tests\SolrReindexTest;
 
 use SilverStripe\ORM\DataExtension;
 use SilverStripe\Dev\TestOnly;
+use SilverStripe\ORM\Queries\SQLSelect;
+use SilverStripe\ORM\DataQuery;
 use SilverStripe\FullTextSearch\Tests\SolrReindexTest\SolrReindexTest_Variant;
 use SilverStripe\Core\Convert;
 
@@ -18,7 +20,7 @@ class SolrReindexTest_ItemExtension extends DataExtension implements TestOnly
      * @param SQLQuery $query
      * @param DataQuery $dataQuery
      */
-    public function augmentSQL(SilverStripe\ORM\Queries\SQLSelect $query, SilverStripe\ORM\DataQuery $dataQuery = NULL)
+    public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = NULL)
     {
         $variant = SolrReindexTest_Variant::get_current();
         if ($variant !== null && !$query->filtersOnID()) {