diff --git a/test/test_dbquery_endpoints.py b/test/api_endpoints/test_dbquery_endpoints.py
old mode 100755
new mode 100644
similarity index 100%
rename from test/test_dbquery_endpoints.py
rename to test/api_endpoints/test_dbquery_endpoints.py
diff --git a/test/test_device_endpoints.py b/test/api_endpoints/test_device_endpoints.py
old mode 100755
new mode 100644
similarity index 100%
rename from test/test_device_endpoints.py
rename to test/api_endpoints/test_device_endpoints.py
diff --git a/test/test_devices_endpoints.py b/test/api_endpoints/test_devices_endpoints.py
old mode 100755
new mode 100644
similarity index 100%
rename from test/test_devices_endpoints.py
rename to test/api_endpoints/test_devices_endpoints.py
diff --git a/test/test_events_endpoints.py b/test/api_endpoints/test_events_endpoints.py
old mode 100755
new mode 100644
similarity index 100%
rename from test/test_events_endpoints.py
rename to test/api_endpoints/test_events_endpoints.py
diff --git a/test/test_graphq_endpoints.py b/test/api_endpoints/test_graphq_endpoints.py
old mode 100755
new mode 100644
similarity index 100%
rename from test/test_graphq_endpoints.py
rename to test/api_endpoints/test_graphq_endpoints.py
diff --git a/test/test_history_endpoints.py b/test/api_endpoints/test_history_endpoints.py
old mode 100755
new mode 100644
similarity index 100%
rename from test/test_history_endpoints.py
rename to test/api_endpoints/test_history_endpoints.py
diff --git a/test/test_messaging_in_app_endpoints.py b/test/api_endpoints/test_messaging_in_app_endpoints.py
old mode 100755
new mode 100644
similarity index 100%
rename from test/test_messaging_in_app_endpoints.py
rename to test/api_endpoints/test_messaging_in_app_endpoints.py
diff --git a/test/test_nettools_endpoints.py b/test/api_endpoints/test_nettools_endpoints.py
old mode 100755
new mode 100644
similarity index 100%
rename from test/test_nettools_endpoints.py
rename to test/api_endpoints/test_nettools_endpoints.py
diff --git a/test/test_sessions_endpoints.py b/test/api_endpoints/test_sessions_endpoints.py
old mode 100755
new mode 100644
similarity index 100%
rename from test/test_sessions_endpoints.py
rename to test/api_endpoints/test_sessions_endpoints.py
diff --git a/test/test_settings_endpoints.py b/test/api_endpoints/test_settings_endpoints.py
old mode 100755
new mode 100644
similarity index 100%
rename from test/test_settings_endpoints.py
rename to test/api_endpoints/test_settings_endpoints.py
diff --git a/test/test_compound_conditions.py b/test/backend/test_compound_conditions.py
old mode 100755
new mode 100644
similarity index 100%
rename from test/test_compound_conditions.py
rename to test/backend/test_compound_conditions.py
diff --git a/test/test_safe_builder_unit.py b/test/backend/test_safe_builder_unit.py
old mode 100755
new mode 100644
similarity index 100%
rename from test/test_safe_builder_unit.py
rename to test/backend/test_safe_builder_unit.py
diff --git a/test/test_sql_injection_prevention.py b/test/backend/test_sql_injection_prevention.py
old mode 100755
new mode 100644
similarity index 100%
rename from test/test_sql_injection_prevention.py
rename to test/backend/test_sql_injection_prevention.py
diff --git a/test/test_sql_security.py b/test/backend/test_sql_security.py
old mode 100755
new mode 100644
similarity index 100%
rename from test/test_sql_security.py
rename to test/backend/test_sql_security.py