diff --git a/tests/hwsim/test_connect_cmd.py b/tests/hwsim/test_connect_cmd.py
index b810536bb..56e77b670 100644
--- a/tests/hwsim/test_connect_cmd.py
+++ b/tests/hwsim/test_connect_cmd.py
@@ -11,9 +11,7 @@ import time
 import hwsim_utils
 import hostapd
 from wpasupplicant import WpaSupplicant
-from test_p2p_grpform import go_neg_pin_authorized
-from test_p2p_grpform import check_grpform_results
-from test_p2p_grpform import remove_group
+from p2p_utils import *
 
 def test_connect_cmd_open(dev, apdev):
     """Open connection using cfg80211 connect command"""
diff --git a/tests/hwsim/test_offchannel_tx.py b/tests/hwsim/test_offchannel_tx.py
index 6d4939230..85308da26 100644
--- a/tests/hwsim/test_offchannel_tx.py
+++ b/tests/hwsim/test_offchannel_tx.py
@@ -11,9 +11,7 @@ import hostapd
 from wpasupplicant import WpaSupplicant
 from test_gas import start_ap
 from test_gas import anqp_get
-from test_p2p_grpform import go_neg_pin_authorized
-from test_p2p_grpform import check_grpform_results
-from test_p2p_grpform import remove_group
+from p2p_utils import *
 
 def test_offchannel_tx_roc_gas(dev, apdev):
     """GAS using cfg80211 remain-on-channel for offchannel TX"""