diff --git a/tests/test_preprocessors.py b/tests/data_tests/test_dataset_formatters.py
similarity index 100%
rename from tests/test_preprocessors.py
rename to tests/data_tests/test_dataset_formatters.py
diff --git a/tests/test_loader.py b/tests/data_tests/test_loader.py
similarity index 100%
rename from tests/test_loader.py
rename to tests/data_tests/test_loader.py
diff --git a/tests/test_synthesize.py b/tests/inference_tests/test_synthesize.py
similarity index 100%
rename from tests/test_synthesize.py
rename to tests/inference_tests/test_synthesize.py
diff --git a/tests/test_synthesizer.py b/tests/inference_tests/test_synthesizer.py
similarity index 100%
rename from tests/test_synthesizer.py
rename to tests/inference_tests/test_synthesizer.py
diff --git a/tests/test_audio.py b/tests/test_audio_processor.py
similarity index 100%
rename from tests/test_audio.py
rename to tests/test_audio_processor.py
diff --git a/tests/tts_tests/test_japanese_phonemizer.py b/tests/text_tests/test_japanese_phonemizer.py
similarity index 100%
rename from tests/tts_tests/test_japanese_phonemizer.py
rename to tests/text_tests/test_japanese_phonemizer.py
diff --git a/tests/test_symbols.py b/tests/text_tests/test_symbols.py
similarity index 100%
rename from tests/test_symbols.py
rename to tests/text_tests/test_symbols.py
diff --git a/tests/test_text_cleaners.py b/tests/text_tests/test_text_cleaners.py
similarity index 100%
rename from tests/test_text_cleaners.py
rename to tests/text_tests/test_text_cleaners.py
diff --git a/tests/test_feed_forward_layers.py b/tests/tts_tests/test_feed_forward_layers.py
similarity index 100%
rename from tests/test_feed_forward_layers.py
rename to tests/tts_tests/test_feed_forward_layers.py
diff --git a/tests/test_glow_tts.py b/tests/tts_tests/test_glow_tts.py
similarity index 100%
rename from tests/test_glow_tts.py
rename to tests/tts_tests/test_glow_tts.py
diff --git a/tests/test_speedy_speech_layers.py b/tests/tts_tests/test_speedy_speech_layers.py
similarity index 100%
rename from tests/test_speedy_speech_layers.py
rename to tests/tts_tests/test_speedy_speech_layers.py
diff --git a/tests/test_tacotron2_model.py b/tests/tts_tests/test_tacotron2_model.py
similarity index 100%
rename from tests/test_tacotron2_model.py
rename to tests/tts_tests/test_tacotron2_model.py
diff --git a/tests/test_tacotron2_tf_model.py b/tests/tts_tests/test_tacotron2_tf_model.py
similarity index 100%
rename from tests/test_tacotron2_tf_model.py
rename to tests/tts_tests/test_tacotron2_tf_model.py
diff --git a/tests/test_layers.py b/tests/tts_tests/test_tacotron_layers.py
similarity index 100%
rename from tests/test_layers.py
rename to tests/tts_tests/test_tacotron_layers.py
diff --git a/tests/test_tacotron_model.py b/tests/tts_tests/test_tacotron_model.py
similarity index 100%
rename from tests/test_tacotron_model.py
rename to tests/tts_tests/test_tacotron_model.py