diff --git a/cinder/tests/unit/test_backup_ceph.py b/cinder/tests/unit/backup/drivers/test_backup_ceph.py
similarity index 100%
rename from cinder/tests/unit/test_backup_ceph.py
rename to cinder/tests/unit/backup/drivers/test_backup_ceph.py
diff --git a/cinder/tests/unit/test_backup_driver_base.py b/cinder/tests/unit/backup/drivers/test_backup_driver_base.py
similarity index 100%
rename from cinder/tests/unit/test_backup_driver_base.py
rename to cinder/tests/unit/backup/drivers/test_backup_driver_base.py
diff --git a/cinder/tests/unit/test_backup_google.py b/cinder/tests/unit/backup/drivers/test_backup_google.py
similarity index 100%
rename from cinder/tests/unit/test_backup_google.py
rename to cinder/tests/unit/backup/drivers/test_backup_google.py
diff --git a/cinder/tests/unit/test_backup_swift.py b/cinder/tests/unit/backup/drivers/test_backup_swift.py
similarity index 100%
rename from cinder/tests/unit/test_backup_swift.py
rename to cinder/tests/unit/backup/drivers/test_backup_swift.py
diff --git a/cinder/tests/unit/test_backup_tsm.py b/cinder/tests/unit/backup/drivers/test_backup_tsm.py
similarity index 100%
rename from cinder/tests/unit/test_backup_tsm.py
rename to cinder/tests/unit/backup/drivers/test_backup_tsm.py
diff --git a/cinder/tests/unit/fake_backup.py b/cinder/tests/unit/backup/fake_backup.py
similarity index 100%
rename from cinder/tests/unit/fake_backup.py
rename to cinder/tests/unit/backup/fake_backup.py
diff --git a/cinder/tests/unit/test_backup.py b/cinder/tests/unit/backup/test_backup.py
similarity index 100%
rename from cinder/tests/unit/test_backup.py
rename to cinder/tests/unit/backup/test_backup.py
diff --git a/cinder/tests/unit/backup/test_rpcapi.py b/cinder/tests/unit/backup/test_rpcapi.py
index f1e13ad80..70136691a 100644
--- a/cinder/tests/unit/backup/test_rpcapi.py
+++ b/cinder/tests/unit/backup/test_rpcapi.py
@@ -24,7 +24,7 @@ from cinder.backup import rpcapi as backup_rpcapi
 from cinder import context
 from cinder import objects
 from cinder import test
-from cinder.tests.unit import fake_backup
+from cinder.tests.unit.backup import fake_backup
 from cinder.tests.unit import fake_constants as fake
 
 
diff --git a/cinder/tests/unit/test_sheepdog.py b/cinder/tests/unit/test_sheepdog.py
index 38069f130..fec8a88e6 100644
--- a/cinder/tests/unit/test_sheepdog.py
+++ b/cinder/tests/unit/test_sheepdog.py
@@ -31,7 +31,7 @@ from cinder import exception
 from cinder.i18n import _
 from cinder.image import image_utils
 from cinder import test
-from cinder.tests.unit import fake_backup
+from cinder.tests.unit.backup import fake_backup
 from cinder.tests.unit import fake_constants as fake
 from cinder.tests.unit import fake_snapshot
 from cinder.tests.unit import fake_volume
diff --git a/cinder/tests/unit/test_volume_rpcapi.py b/cinder/tests/unit/test_volume_rpcapi.py
index e1664d947..49f8ebda8 100644
--- a/cinder/tests/unit/test_volume_rpcapi.py
+++ b/cinder/tests/unit/test_volume_rpcapi.py
@@ -25,7 +25,7 @@ from cinder import db
 from cinder import objects
 from cinder.objects import fields
 from cinder import test
-from cinder.tests.unit import fake_backup
+from cinder.tests.unit.backup import fake_backup
 from cinder.tests.unit import fake_constants as fake
 from cinder.tests.unit import fake_snapshot
 from cinder.tests.unit import fake_volume
diff --git a/cinder/tests/unit/test_volume_utils.py b/cinder/tests/unit/test_volume_utils.py
index f9ed2cce2..ff3f8af82 100644
--- a/cinder/tests/unit/test_volume_utils.py
+++ b/cinder/tests/unit/test_volume_utils.py
@@ -28,7 +28,7 @@ from cinder import context
 from cinder import exception
 from cinder.objects import fields
 from cinder import test
-from cinder.tests.unit import fake_backup
+from cinder.tests.unit.backup import fake_backup
 from cinder.tests.unit import fake_constants as fake
 from cinder.tests.unit import fake_snapshot
 from cinder.tests.unit import fake_volume