diff --git a/monkey/infection_monkey/exploit/tools/payload_parsing_test.py b/monkey/infection_monkey/exploit/tools/test_payload_parsing.py
similarity index 100%
rename from monkey/infection_monkey/exploit/tools/payload_parsing_test.py
rename to monkey/infection_monkey/exploit/tools/test_payload_parsing.py
diff --git a/monkey/infection_monkey/model/victim_host_generator_test.py b/monkey/infection_monkey/model/test_victim_host_generator.py
similarity index 100%
rename from monkey/infection_monkey/model/victim_host_generator_test.py
rename to monkey/infection_monkey/model/test_victim_host_generator.py
diff --git a/monkey/infection_monkey/utils/plugins/plugin_test.py b/monkey/infection_monkey/utils/plugins/test_plugin.py
similarity index 100%
rename from monkey/infection_monkey/utils/plugins/plugin_test.py
rename to monkey/infection_monkey/utils/plugins/test_plugin.py
diff --git a/monkey/monkey_island/cc/resources/test/log_test.py b/monkey/monkey_island/cc/resources/test/test_log.py
similarity index 100%
rename from monkey/monkey_island/cc/resources/test/log_test.py
rename to monkey/monkey_island/cc/resources/test/test_log.py
diff --git a/monkey/monkey_island/cc/resources/test/monkey_test.py b/monkey/monkey_island/cc/resources/test/test_monkey.py
similarity index 100%
rename from monkey/monkey_island/cc/resources/test/monkey_test.py
rename to monkey/monkey_island/cc/resources/test/test_monkey.py
diff --git a/monkey/monkey_island/cc/resources/test/telemetry_test.py b/monkey/monkey_island/cc/resources/test/test_telemetry.py
similarity index 100%
rename from monkey/monkey_island/cc/resources/test/telemetry_test.py
rename to monkey/monkey_island/cc/resources/test/test_telemetry.py
diff --git a/monkey/monkey_island/cc/resources/bootloader_test.py b/monkey/monkey_island/cc/resources/test_bootloader.py
similarity index 100%
rename from monkey/monkey_island/cc/resources/bootloader_test.py
rename to monkey/monkey_island/cc/resources/test_bootloader.py
diff --git a/monkey/monkey_island/cc/services/bootloader_test.py b/monkey/monkey_island/cc/services/test_bootloader.py
similarity index 100%
rename from monkey/monkey_island/cc/services/bootloader_test.py
rename to monkey/monkey_island/cc/services/test_bootloader.py
diff --git a/monkey/monkey_island/cc/services/representations_test.py b/monkey/monkey_island/cc/services/test_representations.py
similarity index 100%
rename from monkey/monkey_island/cc/services/representations_test.py
rename to monkey/monkey_island/cc/services/test_representations.py
diff --git a/monkey/monkey_island/cc/services/utils/node_states_test.py b/monkey/monkey_island/cc/services/utils/test_node_states.py
similarity index 100%
rename from monkey/monkey_island/cc/services/utils/node_states_test.py
rename to monkey/monkey_island/cc/services/utils/test_node_states.py