diff --git a/heat/tests/test_eip.py b/heat/tests/aws/test_eip.py
similarity index 100%
rename from heat/tests/test_eip.py
rename to heat/tests/aws/test_eip.py
diff --git a/heat/tests/test_instance.py b/heat/tests/aws/test_instance.py
similarity index 100%
rename from heat/tests/test_instance.py
rename to heat/tests/aws/test_instance.py
diff --git a/heat/tests/test_instance_network.py b/heat/tests/aws/test_instance_network.py
similarity index 100%
rename from heat/tests/test_instance_network.py
rename to heat/tests/aws/test_instance_network.py
diff --git a/heat/tests/test_loadbalancer.py b/heat/tests/aws/test_loadbalancer.py
similarity index 100%
rename from heat/tests/test_loadbalancer.py
rename to heat/tests/aws/test_loadbalancer.py
diff --git a/heat/tests/test_network_interface.py b/heat/tests/aws/test_network_interface.py
similarity index 100%
rename from heat/tests/test_network_interface.py
rename to heat/tests/aws/test_network_interface.py
diff --git a/heat/tests/test_s3.py b/heat/tests/aws/test_s3.py
similarity index 100%
rename from heat/tests/test_s3.py
rename to heat/tests/aws/test_s3.py
diff --git a/heat/tests/test_security_group.py b/heat/tests/aws/test_security_group.py
similarity index 100%
rename from heat/tests/test_security_group.py
rename to heat/tests/aws/test_security_group.py
diff --git a/heat/tests/test_user.py b/heat/tests/aws/test_user.py
similarity index 100%
rename from heat/tests/test_user.py
rename to heat/tests/aws/test_user.py