diff --git a/monkey/tests/infection_monkey/exploit/tests/test_zerologon.py b/monkey/tests/infection_monkey/exploit/test_zerologon.py
similarity index 100%
rename from monkey/tests/infection_monkey/exploit/tests/test_zerologon.py
rename to monkey/tests/infection_monkey/exploit/test_zerologon.py
diff --git a/monkey/tests/infection_monkey/exploit/tests/zerologon_utils/test_vuln_assessment.py b/monkey/tests/infection_monkey/exploit/zerologon_utils/test_vuln_assessment.py
similarity index 100%
rename from monkey/tests/infection_monkey/exploit/tests/zerologon_utils/test_vuln_assessment.py
rename to monkey/tests/infection_monkey/exploit/zerologon_utils/test_vuln_assessment.py
diff --git a/monkey/tests/infection_monkey/post_breach/tests/actions/test_users_custom_pba.py b/monkey/tests/infection_monkey/post_breach/actions/test_users_custom_pba.py
similarity index 100%
rename from monkey/tests/infection_monkey/post_breach/tests/actions/test_users_custom_pba.py
rename to monkey/tests/infection_monkey/post_breach/actions/test_users_custom_pba.py
diff --git a/monkey/tests/infection_monkey/telemetry/tests/attack/test_attack_telem.py b/monkey/tests/infection_monkey/telemetry/attack/test_attack_telem.py
similarity index 100%
rename from monkey/tests/infection_monkey/telemetry/tests/attack/test_attack_telem.py
rename to monkey/tests/infection_monkey/telemetry/attack/test_attack_telem.py
diff --git a/monkey/tests/infection_monkey/telemetry/tests/attack/test_t1005_telem.py b/monkey/tests/infection_monkey/telemetry/attack/test_t1005_telem.py
similarity index 100%
rename from monkey/tests/infection_monkey/telemetry/tests/attack/test_t1005_telem.py
rename to monkey/tests/infection_monkey/telemetry/attack/test_t1005_telem.py
diff --git a/monkey/tests/infection_monkey/telemetry/tests/attack/test_t1035_telem.py b/monkey/tests/infection_monkey/telemetry/attack/test_t1035_telem.py
similarity index 100%
rename from monkey/tests/infection_monkey/telemetry/tests/attack/test_t1035_telem.py
rename to monkey/tests/infection_monkey/telemetry/attack/test_t1035_telem.py
diff --git a/monkey/tests/infection_monkey/telemetry/tests/attack/test_t1064_telem.py b/monkey/tests/infection_monkey/telemetry/attack/test_t1064_telem.py
similarity index 100%
rename from monkey/tests/infection_monkey/telemetry/tests/attack/test_t1064_telem.py
rename to monkey/tests/infection_monkey/telemetry/attack/test_t1064_telem.py
diff --git a/monkey/tests/infection_monkey/telemetry/tests/attack/test_t1105_telem.py b/monkey/tests/infection_monkey/telemetry/attack/test_t1105_telem.py
similarity index 100%
rename from monkey/tests/infection_monkey/telemetry/tests/attack/test_t1105_telem.py
rename to monkey/tests/infection_monkey/telemetry/attack/test_t1105_telem.py
diff --git a/monkey/tests/infection_monkey/telemetry/tests/attack/test_t1106_telem.py b/monkey/tests/infection_monkey/telemetry/attack/test_t1106_telem.py
similarity index 100%
rename from monkey/tests/infection_monkey/telemetry/tests/attack/test_t1106_telem.py
rename to monkey/tests/infection_monkey/telemetry/attack/test_t1106_telem.py
diff --git a/monkey/tests/infection_monkey/telemetry/tests/attack/test_t1107_telem.py b/monkey/tests/infection_monkey/telemetry/attack/test_t1107_telem.py
similarity index 100%
rename from monkey/tests/infection_monkey/telemetry/tests/attack/test_t1107_telem.py
rename to monkey/tests/infection_monkey/telemetry/attack/test_t1107_telem.py
diff --git a/monkey/tests/infection_monkey/telemetry/tests/attack/test_t1129_telem.py b/monkey/tests/infection_monkey/telemetry/attack/test_t1129_telem.py
similarity index 100%
rename from monkey/tests/infection_monkey/telemetry/tests/attack/test_t1129_telem.py
rename to monkey/tests/infection_monkey/telemetry/attack/test_t1129_telem.py
diff --git a/monkey/tests/infection_monkey/telemetry/tests/attack/test_t1197_telem.py b/monkey/tests/infection_monkey/telemetry/attack/test_t1197_telem.py
similarity index 100%
rename from monkey/tests/infection_monkey/telemetry/tests/attack/test_t1197_telem.py
rename to monkey/tests/infection_monkey/telemetry/attack/test_t1197_telem.py
diff --git a/monkey/tests/infection_monkey/telemetry/tests/attack/test_t1222_telem.py b/monkey/tests/infection_monkey/telemetry/attack/test_t1222_telem.py
similarity index 100%
rename from monkey/tests/infection_monkey/telemetry/tests/attack/test_t1222_telem.py
rename to monkey/tests/infection_monkey/telemetry/attack/test_t1222_telem.py
diff --git a/monkey/tests/infection_monkey/telemetry/tests/attack/test_usage_telem.py b/monkey/tests/infection_monkey/telemetry/attack/test_usage_telem.py
similarity index 100%
rename from monkey/tests/infection_monkey/telemetry/tests/attack/test_usage_telem.py
rename to monkey/tests/infection_monkey/telemetry/attack/test_usage_telem.py
diff --git a/monkey/tests/infection_monkey/telemetry/tests/attack/test_victim_host_telem.py b/monkey/tests/infection_monkey/telemetry/attack/test_victim_host_telem.py
similarity index 100%
rename from monkey/tests/infection_monkey/telemetry/tests/attack/test_victim_host_telem.py
rename to monkey/tests/infection_monkey/telemetry/attack/test_victim_host_telem.py
diff --git a/monkey/tests/infection_monkey/telemetry/tests/conftest.py b/monkey/tests/infection_monkey/telemetry/conftest.py
similarity index 100%
rename from monkey/tests/infection_monkey/telemetry/tests/conftest.py
rename to monkey/tests/infection_monkey/telemetry/conftest.py
diff --git a/monkey/tests/infection_monkey/telemetry/tests/test_exploit_telem.py b/monkey/tests/infection_monkey/telemetry/test_exploit_telem.py
similarity index 100%
rename from monkey/tests/infection_monkey/telemetry/tests/test_exploit_telem.py
rename to monkey/tests/infection_monkey/telemetry/test_exploit_telem.py
diff --git a/monkey/tests/infection_monkey/telemetry/tests/test_post_breach_telem.py b/monkey/tests/infection_monkey/telemetry/test_post_breach_telem.py
similarity index 100%
rename from monkey/tests/infection_monkey/telemetry/tests/test_post_breach_telem.py
rename to monkey/tests/infection_monkey/telemetry/test_post_breach_telem.py
diff --git a/monkey/tests/infection_monkey/telemetry/tests/test_scan_telem.py b/monkey/tests/infection_monkey/telemetry/test_scan_telem.py
similarity index 100%
rename from monkey/tests/infection_monkey/telemetry/tests/test_scan_telem.py
rename to monkey/tests/infection_monkey/telemetry/test_scan_telem.py
diff --git a/monkey/tests/infection_monkey/telemetry/tests/test_state_telem.py b/monkey/tests/infection_monkey/telemetry/test_state_telem.py
similarity index 100%
rename from monkey/tests/infection_monkey/telemetry/tests/test_state_telem.py
rename to monkey/tests/infection_monkey/telemetry/test_state_telem.py
diff --git a/monkey/tests/infection_monkey/telemetry/tests/test_system_info_telem.py b/monkey/tests/infection_monkey/telemetry/test_system_info_telem.py
similarity index 100%
rename from monkey/tests/infection_monkey/telemetry/tests/test_system_info_telem.py
rename to monkey/tests/infection_monkey/telemetry/test_system_info_telem.py
diff --git a/monkey/tests/infection_monkey/telemetry/tests/test_trace_telem.py b/monkey/tests/infection_monkey/telemetry/test_trace_telem.py
similarity index 100%
rename from monkey/tests/infection_monkey/telemetry/tests/test_trace_telem.py
rename to monkey/tests/infection_monkey/telemetry/test_trace_telem.py
diff --git a/monkey/tests/infection_monkey/telemetry/tests/test_tunnel_telem.py b/monkey/tests/infection_monkey/telemetry/test_tunnel_telem.py
similarity index 100%
rename from monkey/tests/infection_monkey/telemetry/tests/test_tunnel_telem.py
rename to monkey/tests/infection_monkey/telemetry/test_tunnel_telem.py
diff --git a/monkey/tests/monkey_island/cc/services/tests/test_config.py b/monkey/tests/monkey_island/cc/services/test_config.py
similarity index 100%
rename from monkey/tests/monkey_island/cc/services/tests/test_config.py
rename to monkey/tests/monkey_island/cc/services/test_config.py