diff --git a/Makefile b/Makefile
index 9650291..11d75a7 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,6 @@ CONFIG_MP_INCLUDED = y
 CONFIG_POWER_SAVING = y
 CONFIG_USB_AUTOSUSPEND = n
 CONFIG_HW_PWRP_DETECTION = n
-CONFIG_WIFI_TEST = n
 CONFIG_BT_COEXIST = n
 CONFIG_EFUSE_CONFIG_FILE = n
 CONFIG_EXT_CLK = n
@@ -119,10 +118,6 @@ ifeq ($(CONFIG_HW_PWRP_DETECTION), y)
 EXTRA_CFLAGS += -DCONFIG_HW_PWRP_DETECTION
 endif
 
-ifeq ($(CONFIG_WIFI_TEST), y)
-EXTRA_CFLAGS += -DCONFIG_WIFI_TEST
-endif
-
 ifeq ($(CONFIG_BT_COEXIST), y)
 EXTRA_CFLAGS += -DCONFIG_BT_COEXIST
 endif
diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c
index 363c451..8fcccb0 100644
--- a/core/rtw_mlme_ext.c
+++ b/core/rtw_mlme_ext.c
@@ -749,13 +749,6 @@ unsigned int OnProbeReq(_adapter *padapter, union recv_frame *precv_frame)
 
 		/* 	Commented by Kurt 2012/10/16 */
 		/* 	IOT issue: Google Nexus7 use 1M rate to send p2p_probe_req after GO nego completed and Nexus7 is client */
-#ifdef CONFIG_WIFI_TEST
-		if ( pattrib->mcs_rate <= 3 )
-		{
-			wifi_test_chk_rate = 0;
-		}
-#endif /* CONFIG_WIFI_TEST */
-
 		if ( wifi_test_chk_rate == 1 )
 		{
 			if ((is_valid_p2p_probereq = process_probe_req_p2p_ie(pwdinfo, pframe, len)) == true)
diff --git a/include/autoconf.h b/include/autoconf.h
index afb3416..4dc3f3c 100644
--- a/include/autoconf.h
+++ b/include/autoconf.h
@@ -63,9 +63,7 @@
 #define CONFIG_P2P
 #ifdef CONFIG_P2P
 
-	#ifndef CONFIG_WIFI_TEST
-		#define CONFIG_P2P_REMOVE_GROUP_INFO
-	#endif
+	#define CONFIG_P2P_REMOVE_GROUP_INFO
 
 	#define CONFIG_P2P_PS
 #endif
diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c
index c269c40..c9d86f2 100644
--- a/os_dep/os_intfs.c
+++ b/os_dep/os_intfs.c
@@ -114,11 +114,7 @@ static int rtw_lowrate_two_xmit = 1;//Use 2 path Tx to transmit MCS0~7 and legac
 
 static int rtw_rf_config = RF_819X_MAX_TYPE;  //auto
 static int rtw_low_power = 0;
-#ifdef CONFIG_WIFI_TEST
-static int rtw_wifi_spec = 1;//for wifi test
-#else
 static int rtw_wifi_spec = 0;
-#endif
 static int rtw_channel_plan = RT_CHANNEL_DOMAIN_MAX;
 
 #ifdef CONFIG_BT_COEXIST