diff --git a/tests/hopp/test_hybrid.py b/tests/hopp/limit/test_hybrid.py
similarity index 100%
rename from tests/hopp/test_hybrid.py
rename to tests/hopp/limit/test_hybrid.py
diff --git a/tests/hopp/test_interface.py b/tests/hopp/limit/test_interface.py
similarity index 100%
rename from tests/hopp/test_interface.py
rename to tests/hopp/limit/test_interface.py
diff --git a/tests/hopp/test_layout.py b/tests/hopp/limit/test_layout.py
similarity index 100%
rename from tests/hopp/test_layout.py
rename to tests/hopp/limit/test_layout.py
diff --git a/tests/hopp/test_pv_source.py b/tests/hopp/limit/test_pv_source.py
similarity index 100%
rename from tests/hopp/test_pv_source.py
rename to tests/hopp/limit/test_pv_source.py
diff --git a/tests/hopp/test_reopt.py b/tests/hopp/limit/test_reopt.py
similarity index 100%
rename from tests/hopp/test_reopt.py
rename to tests/hopp/limit/test_reopt.py
diff --git a/tests/hopp/test_resource.py b/tests/hopp/limit/test_resource.py
similarity index 100%
rename from tests/hopp/test_resource.py
rename to tests/hopp/limit/test_resource.py
diff --git a/tests/hopp/test_resource_download.py b/tests/hopp/limit/test_resource_download.py
similarity index 100%
rename from tests/hopp/test_resource_download.py
rename to tests/hopp/limit/test_resource_download.py
diff --git a/tests/hopp/limit/test_solar_wind.py b/tests/hopp/test_solar_wind.py
similarity index 100%
rename from tests/hopp/limit/test_solar_wind.py
rename to tests/hopp/test_solar_wind.py
diff --git a/tests/hopp/limit/test_tower_source.py b/tests/hopp/test_tower_source.py
similarity index 100%
rename from tests/hopp/limit/test_tower_source.py
rename to tests/hopp/test_tower_source.py
diff --git a/tests/hopp/limit/test_trough_source.py b/tests/hopp/test_trough_source.py
similarity index 100%
rename from tests/hopp/limit/test_trough_source.py
rename to tests/hopp/test_trough_source.py
diff --git a/tests/hopp/limit/test_utility_rate.py b/tests/hopp/test_utility_rate.py
similarity index 100%
rename from tests/hopp/limit/test_utility_rate.py
rename to tests/hopp/test_utility_rate.py
diff --git a/tests/hopp/limit/test_wave.py b/tests/hopp/test_wave.py
similarity index 100%
rename from tests/hopp/limit/test_wave.py
rename to tests/hopp/test_wave.py
diff --git a/tests/hopp/limit/test_wind.py b/tests/hopp/test_wind.py
similarity index 100%
rename from tests/hopp/limit/test_wind.py
rename to tests/hopp/test_wind.py