diff --git a/tests/test_network.robot b/extended/test_network.robot
similarity index 99%
rename from tests/test_network.robot
rename to extended/test_network.robot
index 242b163..3ad5a95 100755
--- a/tests/test_network.robot
+++ b/extended/test_network.robot
@@ -13,6 +13,8 @@
 Suite Teardown      Close All Connections
 Test Teardown       FFDC On Test Case Fail
 
+Force Tags  NetworkManager
+
 *** Variables ***
 
 ${NW_MANAGER}    ${NETWORK_MANAGER_URI}Interface
diff --git a/test_lists/skip_test b/test_lists/skip_test
index 24054eb..2fb1f78 100644
--- a/test_lists/skip_test
+++ b/test_lists/skip_test
@@ -53,3 +53,5 @@
 -e Check_BMC_Clocks_Compatible_Property_Is_Set
 #openbmc/openbmc-test-automation/issues/75
 -e eSEL_Logging
+#openbmc/openbmc-test-automation/issues/396
+-e NetworkManager
diff --git a/test_lists/skip_test_palmetto b/test_lists/skip_test_palmetto
index d47b6b2..11d0797 100644
--- a/test_lists/skip_test_palmetto
+++ b/test_lists/skip_test_palmetto
@@ -43,10 +43,6 @@
 -e IPMI_Chassis_Status_On
 -e IPMI_Chassis_Status_Off
 -e IPMI_Chassis_Restore_Power_Policy
-#https://github.com/openbmc/openbmc/issues/830
--e Good_connection_for_testing
--e get_directory_listing
--e get_directory_listing_xyz
 #https://github.com/openbmc/openbmc-test-automation/issues/90
 -e Verify_System_VPD_Properties
 #https://github.com/openbmc/openbmc/issues/928
@@ -57,3 +53,5 @@
 -e Check_BMC_Name_Property_Is_Set
 #openbmc/openbmc-test-automation/issues/75
 -e eSEL_Logging
+#openbmc/openbmc-test-automation/issues/396
+-e NetworkManager
diff --git a/test_lists/skip_test_witherspoon b/test_lists/skip_test_witherspoon
index 1eaa7f0..6b7d91d 100644
--- a/test_lists/skip_test_witherspoon
+++ b/test_lists/skip_test_witherspoon
@@ -43,12 +43,6 @@
 -e powercapping
 -e io_board_Present
 -e io_board_Fault
-#https://github.com/openbmc/openbmc/issues/830
--e Good_connection_for_testing
--e get_directory_listing
--e get_directory_listing_xyz
--e get_names
--e get_names_org
 -e Event_Logging
 -e Association
 #https://github.com/openbmc/openbmc/issues/928
@@ -61,3 +55,5 @@
 -e Check_BMC_Clocks_Compatible_Property_Is_Set
 #openbmc/openbmc-test-automation/issues/75
 -e eSEL_Logging
+#openbmc/openbmc-test-automation/issues/396
+-e NetworkManager