diff --git a/tests/unit/data/sphinx/ar/ActiveRecord.php b/tests/unit/data/ar/sphinx/ActiveRecord.php
similarity index 83%
rename from tests/unit/data/sphinx/ar/ActiveRecord.php
rename to tests/unit/data/ar/sphinx/ActiveRecord.php
index 12150b2..2e5183e 100644
--- a/tests/unit/data/sphinx/ar/ActiveRecord.php
+++ b/tests/unit/data/ar/sphinx/ActiveRecord.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace yiiunit\data\sphinx\ar;
+namespace yiiunit\data\ar\sphinx;
 
 /**
  * Test Sphinx ActiveRecord class
diff --git a/tests/unit/data/sphinx/ar/ArticleDb.php b/tests/unit/data/ar/sphinx/ArticleDb.php
similarity index 92%
rename from tests/unit/data/sphinx/ar/ArticleDb.php
rename to tests/unit/data/ar/sphinx/ArticleDb.php
index 4972112..e81e1f5 100644
--- a/tests/unit/data/sphinx/ar/ArticleDb.php
+++ b/tests/unit/data/ar/sphinx/ArticleDb.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace yiiunit\data\sphinx\ar;
+namespace yiiunit\data\ar\sphinx;
 
 use yii\sphinx\ActiveRelation;
 use yiiunit\data\ar\ActiveRecord as ActiveRecordDb;
diff --git a/tests/unit/data/sphinx/ar/ArticleIndex.php b/tests/unit/data/ar/sphinx/ArticleIndex.php
similarity index 93%
rename from tests/unit/data/sphinx/ar/ArticleIndex.php
rename to tests/unit/data/ar/sphinx/ArticleIndex.php
index 757f6be..ed1073d 100644
--- a/tests/unit/data/sphinx/ar/ArticleIndex.php
+++ b/tests/unit/data/ar/sphinx/ArticleIndex.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace yiiunit\data\sphinx\ar;
+namespace yiiunit\data\ar\sphinx;
 
 use yii\db\ActiveRelation;
 
diff --git a/tests/unit/data/sphinx/ar/ItemDb.php b/tests/unit/data/ar/sphinx/ItemDb.php
similarity index 82%
rename from tests/unit/data/sphinx/ar/ItemDb.php
rename to tests/unit/data/ar/sphinx/ItemDb.php
index ddf7eea..9cf10ad 100644
--- a/tests/unit/data/sphinx/ar/ItemDb.php
+++ b/tests/unit/data/ar/sphinx/ItemDb.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace yiiunit\data\sphinx\ar;
+namespace yiiunit\data\ar\sphinx;
 
 use yiiunit\data\ar\ActiveRecord as ActiveRecordDb;
 
diff --git a/tests/unit/data/sphinx/ar/ItemIndex.php b/tests/unit/data/ar/sphinx/ItemIndex.php
similarity index 77%
rename from tests/unit/data/sphinx/ar/ItemIndex.php
rename to tests/unit/data/ar/sphinx/ItemIndex.php
index 2322429..cfb8418 100644
--- a/tests/unit/data/sphinx/ar/ItemIndex.php
+++ b/tests/unit/data/ar/sphinx/ItemIndex.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace yiiunit\data\sphinx\ar;
+namespace yiiunit\data\ar\sphinx;
 
 class ItemIndex extends ActiveRecord
 {
diff --git a/tests/unit/data/sphinx/ar/RuntimeIndex.php b/tests/unit/data/ar/sphinx/RuntimeIndex.php
similarity index 77%
rename from tests/unit/data/sphinx/ar/RuntimeIndex.php
rename to tests/unit/data/ar/sphinx/RuntimeIndex.php
index 8a0917f..812f27b 100644
--- a/tests/unit/data/sphinx/ar/RuntimeIndex.php
+++ b/tests/unit/data/ar/sphinx/RuntimeIndex.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace yiiunit\data\sphinx\ar;
+namespace yiiunit\data\ar\sphinx;
 
 class RuntimeIndex extends ActiveRecord
 {
diff --git a/tests/unit/data/sphinx/ar/TagDb.php b/tests/unit/data/ar/sphinx/TagDb.php
similarity index 82%
rename from tests/unit/data/sphinx/ar/TagDb.php
rename to tests/unit/data/ar/sphinx/TagDb.php
index 2d87eaf..c70030b 100644
--- a/tests/unit/data/sphinx/ar/TagDb.php
+++ b/tests/unit/data/ar/sphinx/TagDb.php
@@ -1,5 +1,5 @@
 <?php
-namespace yiiunit\data\sphinx\ar;
+namespace yiiunit\data\ar\sphinx;
 
 use yiiunit\data\ar\ActiveRecord as ActiveRecordDb;
 
diff --git a/tests/unit/extensions/sphinx/ActiveDataProviderTest.php b/tests/unit/extensions/sphinx/ActiveDataProviderTest.php
index 6a81900..dbf8184 100644
--- a/tests/unit/extensions/sphinx/ActiveDataProviderTest.php
+++ b/tests/unit/extensions/sphinx/ActiveDataProviderTest.php
@@ -4,8 +4,8 @@ namespace yiiunit\extensions\sphinx;
 
 use yii\data\ActiveDataProvider;
 use yii\sphinx\Query;
-use yiiunit\data\sphinx\ar\ActiveRecord;
-use yiiunit\data\sphinx\ar\ArticleIndex;
+use yiiunit\data\ar\sphinx\ActiveRecord;
+use yiiunit\data\ar\sphinx\ArticleIndex;
 
 /**
  * @group sphinx
diff --git a/tests/unit/extensions/sphinx/ActiveRecordTest.php b/tests/unit/extensions/sphinx/ActiveRecordTest.php
index b167b9e..d86c141 100644
--- a/tests/unit/extensions/sphinx/ActiveRecordTest.php
+++ b/tests/unit/extensions/sphinx/ActiveRecordTest.php
@@ -3,9 +3,9 @@
 namespace yiiunit\extensions\sphinx;
 
 use yii\sphinx\ActiveQuery;
-use yiiunit\data\sphinx\ar\ActiveRecord;
-use yiiunit\data\sphinx\ar\ArticleIndex;
-use yiiunit\data\sphinx\ar\RuntimeIndex;
+use yiiunit\data\ar\sphinx\ActiveRecord;
+use yiiunit\data\ar\sphinx\ArticleIndex;
+use yiiunit\data\ar\sphinx\RuntimeIndex;
 
 /**
  * @group sphinx
diff --git a/tests/unit/extensions/sphinx/ActiveRelationTest.php b/tests/unit/extensions/sphinx/ActiveRelationTest.php
index 05c48c9..f66845f 100644
--- a/tests/unit/extensions/sphinx/ActiveRelationTest.php
+++ b/tests/unit/extensions/sphinx/ActiveRelationTest.php
@@ -2,10 +2,10 @@
 
 namespace yiiunit\extensions\sphinx;
 
-use yiiunit\data\sphinx\ar\ActiveRecord;
+use yiiunit\data\ar\sphinx\ActiveRecord;
 use yiiunit\data\ar\ActiveRecord as ActiveRecordDb;
-use yiiunit\data\sphinx\ar\ArticleIndex;
-use yiiunit\data\sphinx\ar\ArticleDb;
+use yiiunit\data\ar\sphinx\ArticleIndex;
+use yiiunit\data\ar\sphinx\ArticleDb;
 
 /**
  * @group sphinx
diff --git a/tests/unit/extensions/sphinx/ExternalActiveRelationTest.php b/tests/unit/extensions/sphinx/ExternalActiveRelationTest.php
index 0893944..e30a0cf 100644
--- a/tests/unit/extensions/sphinx/ExternalActiveRelationTest.php
+++ b/tests/unit/extensions/sphinx/ExternalActiveRelationTest.php
@@ -2,11 +2,11 @@
 
 namespace yiiunit\extensions\sphinx;
 
-use yiiunit\data\sphinx\ar\ActiveRecord;
+use yiiunit\data\ar\sphinx\ActiveRecord;
 use yiiunit\data\ar\ActiveRecord as ActiveRecordDb;
-use yiiunit\data\sphinx\ar\ArticleIndex;
-use yiiunit\data\sphinx\ar\ArticleDb;
-use yiiunit\data\sphinx\ar\TagDb;
+use yiiunit\data\ar\sphinx\ArticleIndex;
+use yiiunit\data\ar\sphinx\ArticleDb;
+use yiiunit\data\ar\sphinx\TagDb;
 
 /**
  * @group sphinx