diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index 61d371bb0..5586f2663 100644
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -2410,9 +2410,6 @@ static int hostapd_config_fill(struct hostapd_config *conf,
 	} else if (os_strcmp(buf, "radius_server_ipv6") == 0) {
 		bss->radius_server_ipv6 = atoi(pos);
 #endif /* RADIUS_SERVER */
-	} else if (os_strcmp(buf, "test_socket") == 0) {
-		os_free(bss->test_socket);
-		bss->test_socket = os_strdup(pos);
 	} else if (os_strcmp(buf, "use_pae_group_addr") == 0) {
 		bss->use_pae_group_addr = atoi(pos);
 	} else if (os_strcmp(buf, "hw_mode") == 0) {
diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
index 95d6af9e2..6bc04f81c 100644
--- a/hostapd/hostapd.conf
+++ b/hostapd/hostapd.conf
@@ -18,7 +18,7 @@ interface=wlan0
 # interface is also created.
 #bridge=br0
 
-# Driver interface type (hostap/wired/test/none/nl80211/bsd);
+# Driver interface type (hostap/wired/none/nl80211/bsd);
 # default: hostap). nl80211 is used with all Linux mac80211 drivers.
 # Use driver=none if building hostapd as a standalone RADIUS server that does
 # not control any wireless/wired driver.
diff --git a/hostapd/main.c b/hostapd/main.c
index daa6b0f8b..d1a54ce54 100644
--- a/hostapd/main.c
+++ b/hostapd/main.c
@@ -184,9 +184,6 @@ static int hostapd_driver_init(struct hostapd_iface *iface)
 	}
 	params.bssid = b;
 	params.ifname = hapd->conf->iface;
-	params.ssid = hapd->conf->ssid.ssid;
-	params.ssid_len = hapd->conf->ssid.ssid_len;
-	params.test_socket = hapd->conf->test_socket;
 	params.use_pae_group_addr = hapd->conf->use_pae_group_addr;
 
 	params.num_bridge = hapd->iface->num_bss;
diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
index d8021a178..e39effaaa 100644
--- a/src/ap/ap_config.c
+++ b/src/ap/ap_config.c
@@ -450,7 +450,6 @@ void hostapd_config_free_bss(struct hostapd_bss_config *conf)
 	os_free(conf->eap_fast_a_id_info);
 	os_free(conf->eap_sim_db);
 	os_free(conf->radius_server_clients);
-	os_free(conf->test_socket);
 	os_free(conf->radius);
 	os_free(conf->radius_das_shared_secret);
 	hostapd_config_free_vlan(conf);
diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
index 6d57a734e..cf10cdbce 100644
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
@@ -349,8 +349,6 @@ struct hostapd_bss_config {
 	int radius_server_acct_port;
 	int radius_server_ipv6;
 
-	char *test_socket; /* UNIX domain socket path for driver_test */
-
 	int use_pae_group_addr; /* Whether to send EAPOL frames to PAE group
 				 * address instead of individual address
 				 * (for driver_wired.c).
diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 05f6a055c..774e345a7 100644
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -1247,9 +1247,6 @@ struct wpa_init_params {
 	void *global_priv;
 	const u8 *bssid;
 	const char *ifname;
-	const u8 *ssid;
-	size_t ssid_len;
-	const char *test_socket;
 	int use_pae_group_addr;
 	char **bridge;
 	size_t num_bridge;