diff --git a/tests/models/autoencoders/__init__.py b/tests/models/autoencoders/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/models/test_models_vae.py b/tests/models/autoencoders/test_models_vae.py
similarity index 99%
rename from tests/models/test_models_vae.py
rename to tests/models/autoencoders/test_models_vae.py
index a4ff31706b..fd7931a982 100644
--- a/tests/models/test_models_vae.py
+++ b/tests/models/autoencoders/test_models_vae.py
@@ -46,7 +46,7 @@ from diffusers.utils.testing_utils import (
 )
 from diffusers.utils.torch_utils import randn_tensor
 
-from .test_modeling_common import ModelTesterMixin, UNetTesterMixin
+from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin
 
 
 enable_full_determinism()
diff --git a/tests/models/test_models_vae_flax.py b/tests/models/autoencoders/test_models_vae_flax.py
similarity index 94%
rename from tests/models/test_models_vae_flax.py
rename to tests/models/autoencoders/test_models_vae_flax.py
index e5c56b61a5..8fedb85ecc 100644
--- a/tests/models/test_models_vae_flax.py
+++ b/tests/models/autoencoders/test_models_vae_flax.py
@@ -4,7 +4,7 @@ from diffusers import FlaxAutoencoderKL
 from diffusers.utils import is_flax_available
 from diffusers.utils.testing_utils import require_flax
 
-from .test_modeling_common_flax import FlaxModelTesterMixin
+from ..test_modeling_common_flax import FlaxModelTesterMixin
 
 
 if is_flax_available():
diff --git a/tests/models/test_models_vq.py b/tests/models/autoencoders/test_models_vq.py
similarity index 97%
rename from tests/models/test_models_vq.py
rename to tests/models/autoencoders/test_models_vq.py
index a5a9288d64..24ac5f63bd 100644
--- a/tests/models/test_models_vq.py
+++ b/tests/models/autoencoders/test_models_vq.py
@@ -25,7 +25,7 @@ from diffusers.utils.testing_utils import (
     torch_device,
 )
 
-from .test_modeling_common import ModelTesterMixin, UNetTesterMixin
+from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin
 
 
 enable_full_determinism()
diff --git a/tests/models/unets/__init__.py b/tests/models/unets/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/models/test_models_unet_1d.py b/tests/models/unets/test_models_unet_1d.py
similarity index 99%
rename from tests/models/test_models_unet_1d.py
rename to tests/models/unets/test_models_unet_1d.py
index aad4964165..7225f6409b 100644
--- a/tests/models/test_models_unet_1d.py
+++ b/tests/models/unets/test_models_unet_1d.py
@@ -25,7 +25,7 @@ from diffusers.utils.testing_utils import (
     torch_device,
 )
 
-from .test_modeling_common import ModelTesterMixin, UNetTesterMixin
+from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin
 
 
 class UNet1DModelTests(ModelTesterMixin, UNetTesterMixin, unittest.TestCase):
diff --git a/tests/models/test_models_unet_2d.py b/tests/models/unets/test_models_unet_2d.py
similarity index 99%
rename from tests/models/test_models_unet_2d.py
rename to tests/models/unets/test_models_unet_2d.py
index 2be343e9d6..a06dd9cc02 100644
--- a/tests/models/test_models_unet_2d.py
+++ b/tests/models/unets/test_models_unet_2d.py
@@ -30,7 +30,7 @@ from diffusers.utils.testing_utils import (
     torch_device,
 )
 
-from .test_modeling_common import ModelTesterMixin, UNetTesterMixin
+from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin
 
 
 logger = logging.get_logger(__name__)
diff --git a/tests/models/test_models_unet_2d_condition.py b/tests/models/unets/test_models_unet_2d_condition.py
similarity index 99%
rename from tests/models/test_models_unet_2d_condition.py
rename to tests/models/unets/test_models_unet_2d_condition.py
index 1e8c4dca61..a9b3f282c9 100644
--- a/tests/models/test_models_unet_2d_condition.py
+++ b/tests/models/unets/test_models_unet_2d_condition.py
@@ -48,7 +48,7 @@ from diffusers.utils.testing_utils import (
     torch_device,
 )
 
-from .test_modeling_common import ModelTesterMixin, UNetTesterMixin
+from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin
 
 
 logger = logging.get_logger(__name__)
diff --git a/tests/models/test_models_unet_2d_flax.py b/tests/models/unets/test_models_unet_2d_flax.py
similarity index 100%
rename from tests/models/test_models_unet_2d_flax.py
rename to tests/models/unets/test_models_unet_2d_flax.py
diff --git a/tests/models/test_models_unet_3d_condition.py b/tests/models/unets/test_models_unet_3d_condition.py
similarity index 98%
rename from tests/models/test_models_unet_3d_condition.py
rename to tests/models/unets/test_models_unet_3d_condition.py
index 9efaea8d65..88c88b1f49 100644
--- a/tests/models/test_models_unet_3d_condition.py
+++ b/tests/models/unets/test_models_unet_3d_condition.py
@@ -23,7 +23,7 @@ from diffusers.utils import logging
 from diffusers.utils.import_utils import is_xformers_available
 from diffusers.utils.testing_utils import enable_full_determinism, floats_tensor, skip_mps, torch_device
 
-from .test_modeling_common import ModelTesterMixin, UNetTesterMixin
+from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin
 
 
 enable_full_determinism()
diff --git a/tests/models/test_models_unet_motion.py b/tests/models/unets/test_models_unet_motion.py
similarity index 99%
rename from tests/models/test_models_unet_motion.py
rename to tests/models/unets/test_models_unet_motion.py
index 60c3399db5..681a88077b 100644
--- a/tests/models/test_models_unet_motion.py
+++ b/tests/models/unets/test_models_unet_motion.py
@@ -30,7 +30,7 @@ from diffusers.utils.testing_utils import (
     torch_device,
 )
 
-from .test_modeling_common import ModelTesterMixin, UNetTesterMixin
+from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin
 
 
 logger = logging.get_logger(__name__)
diff --git a/tests/models/test_models_unet_spatiotemporal.py b/tests/models/unets/test_models_unet_spatiotemporal.py
similarity index 99%
rename from tests/models/test_models_unet_spatiotemporal.py
rename to tests/models/unets/test_models_unet_spatiotemporal.py
index fa07eaa736..a693645a20 100644
--- a/tests/models/test_models_unet_spatiotemporal.py
+++ b/tests/models/unets/test_models_unet_spatiotemporal.py
@@ -28,7 +28,7 @@ from diffusers.utils.testing_utils import (
     torch_device,
 )
 
-from .test_modeling_common import ModelTesterMixin, UNetTesterMixin
+from ..test_modeling_common import ModelTesterMixin, UNetTesterMixin
 
 
 logger = logging.get_logger(__name__)
diff --git a/tests/models/test_unet_2d_blocks.py b/tests/models/unets/test_unet_2d_blocks.py
similarity index 100%
rename from tests/models/test_unet_2d_blocks.py
rename to tests/models/unets/test_unet_2d_blocks.py
diff --git a/tests/models/test_unet_blocks_common.py b/tests/models/unets/test_unet_blocks_common.py
similarity index 100%
rename from tests/models/test_unet_blocks_common.py
rename to tests/models/unets/test_unet_blocks_common.py
diff --git a/tests/pipelines/test_pipelines_common.py b/tests/pipelines/test_pipelines_common.py
index e107c5772a..e3c8a4ef50 100644
--- a/tests/pipelines/test_pipelines_common.py
+++ b/tests/pipelines/test_pipelines_common.py
@@ -38,7 +38,7 @@ from diffusers.utils.testing_utils import (
     torch_device,
 )
 
-from ..models.test_models_vae import (
+from ..models.autoencoders.test_models_vae import (
     get_asym_autoencoder_kl_config,
     get_autoencoder_kl_config,
     get_autoencoder_tiny_config,