diff --git a/scripts/sonic_sku_create.py b/scripts/sonic_sku_create.py
index bb1fae450cf2..c1ceda7e0a33 100755
--- a/scripts/sonic_sku_create.py
+++ b/scripts/sonic_sku_create.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python2
+#!/usr/bin/python
 """
 usage: sonic_sku_create.py [-h] [-v] [-f FILE] [-m [MINIGRAPH_FILE]] [-b BASE]
                            [-r] [-k HWSKU]
diff --git a/sonic-utilities-tests/sku_create_input/ACS-MSN2700/buffers.json.j2 b/tests/sku_create_input/ACS-MSN2700/buffers.json.j2
similarity index 100%
rename from sonic-utilities-tests/sku_create_input/ACS-MSN2700/buffers.json.j2
rename to tests/sku_create_input/ACS-MSN2700/buffers.json.j2
diff --git a/sonic-utilities-tests/sku_create_input/ACS-MSN2700/buffers_defaults_t0.j2 b/tests/sku_create_input/ACS-MSN2700/buffers_defaults_t0.j2
similarity index 100%
rename from sonic-utilities-tests/sku_create_input/ACS-MSN2700/buffers_defaults_t0.j2
rename to tests/sku_create_input/ACS-MSN2700/buffers_defaults_t0.j2
diff --git a/sonic-utilities-tests/sku_create_input/ACS-MSN2700/buffers_defaults_t1.j2 b/tests/sku_create_input/ACS-MSN2700/buffers_defaults_t1.j2
similarity index 100%
rename from sonic-utilities-tests/sku_create_input/ACS-MSN2700/buffers_defaults_t1.j2
rename to tests/sku_create_input/ACS-MSN2700/buffers_defaults_t1.j2
diff --git a/sonic-utilities-tests/sku_create_input/ACS-MSN2700/pg_profile_lookup.ini b/tests/sku_create_input/ACS-MSN2700/pg_profile_lookup.ini
similarity index 100%
rename from sonic-utilities-tests/sku_create_input/ACS-MSN2700/pg_profile_lookup.ini
rename to tests/sku_create_input/ACS-MSN2700/pg_profile_lookup.ini
diff --git a/sonic-utilities-tests/sku_create_input/ACS-MSN2700/port_config.ini b/tests/sku_create_input/ACS-MSN2700/port_config.ini
similarity index 100%
rename from sonic-utilities-tests/sku_create_input/ACS-MSN2700/port_config.ini
rename to tests/sku_create_input/ACS-MSN2700/port_config.ini
diff --git a/sonic-utilities-tests/sku_create_input/ACS-MSN2700/qos.json b/tests/sku_create_input/ACS-MSN2700/qos.json
similarity index 100%
rename from sonic-utilities-tests/sku_create_input/ACS-MSN2700/qos.json
rename to tests/sku_create_input/ACS-MSN2700/qos.json
diff --git a/sonic-utilities-tests/sku_create_input/ACS-MSN2700/sai.profile b/tests/sku_create_input/ACS-MSN2700/sai.profile
similarity index 100%
rename from sonic-utilities-tests/sku_create_input/ACS-MSN2700/sai.profile
rename to tests/sku_create_input/ACS-MSN2700/sai.profile
diff --git a/sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8.xml b/tests/sku_create_input/Mellanox-SN2700-D48C8.xml
similarity index 100%
rename from sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8.xml
rename to tests/sku_create_input/Mellanox-SN2700-D48C8.xml
diff --git a/sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/buffers.json.j2 b/tests/sku_create_input/Mellanox-SN2700-D48C8/buffers.json.j2
similarity index 100%
rename from sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/buffers.json.j2
rename to tests/sku_create_input/Mellanox-SN2700-D48C8/buffers.json.j2
diff --git a/sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/buffers_defaults_t0.j2 b/tests/sku_create_input/Mellanox-SN2700-D48C8/buffers_defaults_t0.j2
similarity index 100%
rename from sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/buffers_defaults_t0.j2
rename to tests/sku_create_input/Mellanox-SN2700-D48C8/buffers_defaults_t0.j2
diff --git a/sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/buffers_defaults_t1.j2 b/tests/sku_create_input/Mellanox-SN2700-D48C8/buffers_defaults_t1.j2
similarity index 100%
rename from sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/buffers_defaults_t1.j2
rename to tests/sku_create_input/Mellanox-SN2700-D48C8/buffers_defaults_t1.j2
diff --git a/sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/pg_profile_lookup.ini b/tests/sku_create_input/Mellanox-SN2700-D48C8/pg_profile_lookup.ini
similarity index 100%
rename from sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/pg_profile_lookup.ini
rename to tests/sku_create_input/Mellanox-SN2700-D48C8/pg_profile_lookup.ini
diff --git a/sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/port_config.ini b/tests/sku_create_input/Mellanox-SN2700-D48C8/port_config.ini
similarity index 100%
rename from sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/port_config.ini
rename to tests/sku_create_input/Mellanox-SN2700-D48C8/port_config.ini
diff --git a/sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/port_config.ini.bak b/tests/sku_create_input/Mellanox-SN2700-D48C8/port_config.ini.bak
similarity index 100%
rename from sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/port_config.ini.bak
rename to tests/sku_create_input/Mellanox-SN2700-D48C8/port_config.ini.bak
diff --git a/sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/port_config.ini.new b/tests/sku_create_input/Mellanox-SN2700-D48C8/port_config.ini.new
similarity index 100%
rename from sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/port_config.ini.new
rename to tests/sku_create_input/Mellanox-SN2700-D48C8/port_config.ini.new
diff --git a/sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/port_config.ini.orig b/tests/sku_create_input/Mellanox-SN2700-D48C8/port_config.ini.orig
similarity index 100%
rename from sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/port_config.ini.orig
rename to tests/sku_create_input/Mellanox-SN2700-D48C8/port_config.ini.orig
diff --git a/sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/qos.json b/tests/sku_create_input/Mellanox-SN2700-D48C8/qos.json
similarity index 100%
rename from sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/qos.json
rename to tests/sku_create_input/Mellanox-SN2700-D48C8/qos.json
diff --git a/sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/sai.profile b/tests/sku_create_input/Mellanox-SN2700-D48C8/sai.profile
similarity index 100%
rename from sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/sai.profile
rename to tests/sku_create_input/Mellanox-SN2700-D48C8/sai.profile
diff --git a/sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/sai_2700_48x50g_8x100g.xml b/tests/sku_create_input/Mellanox-SN2700-D48C8/sai_2700_48x50g_8x100g.xml
similarity index 100%
rename from sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/sai_2700_48x50g_8x100g.xml
rename to tests/sku_create_input/Mellanox-SN2700-D48C8/sai_2700_48x50g_8x100g.xml
diff --git a/sonic-utilities-tests/sku_create_input/default_sku b/tests/sku_create_input/default_sku
similarity index 100%
rename from sonic-utilities-tests/sku_create_input/default_sku
rename to tests/sku_create_input/default_sku
diff --git a/sonic-utilities-tests/sku_create_test.py b/tests/sku_create_test.py
similarity index 88%
rename from sonic-utilities-tests/sku_create_test.py
rename to tests/sku_create_test.py
index 6106e82e0ce8..c9cb6c787029 100644
--- a/sonic-utilities-tests/sku_create_test.py
+++ b/tests/sku_create_test.py
@@ -7,11 +7,11 @@
 test_path = os.path.dirname(os.path.abspath(__file__))
 modules_path = os.path.dirname(test_path)
 scripts_path = os.path.join(modules_path, "scripts")
-input_path = os.path.join(modules_path, "sonic-utilities-tests/sku_create_input")
+input_path = os.path.join(modules_path, "tests/sku_create_input")
 sku_def_file = os.path.join(input_path, "Mellanox-SN2700-D48C8.xml")
 sku_create_script = os.path.join(scripts_path, "sonic_sku_create.py")
-output_file_path = os.path.join(modules_path, "sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8_NEW/port_config.ini")
-model_file_path = os.path.join(modules_path, "sonic-utilities-tests/sku_create_input/Mellanox-SN2700-D48C8/port_config.ini")
+output_file_path = os.path.join(modules_path, "tests/sku_create_input/Mellanox-SN2700-D48C8_NEW/port_config.ini")
+model_file_path = os.path.join(modules_path, "tests/sku_create_input/Mellanox-SN2700-D48C8/port_config.ini")
 
 sys.path.insert(0, test_path)
 sys.path.insert(0, modules_path)