diff --git a/tests/ap-mgmt-fuzzer/.gitignore b/tests/ap-mgmt-fuzzer/.gitignore
deleted file mode 100644
index 70db3e15d..000000000
--- a/tests/ap-mgmt-fuzzer/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-ap-mgmt-fuzzer
diff --git a/tests/ap-mgmt-fuzzer/Makefile b/tests/ap-mgmt-fuzzer/Makefile
deleted file mode 100644
index 1e06767c4..000000000
--- a/tests/ap-mgmt-fuzzer/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-all: ap-mgmt-fuzzer
-
-ifndef CC
-CC=gcc
-endif
-
-ifndef LDO
-LDO=$(CC)
-endif
-
-ifndef CFLAGS
-CFLAGS = -MMD -O2 -Wall -g
-endif
-
-SRC=../../src
-
-CFLAGS += -I$(SRC)
-CFLAGS += -I$(SRC)/utils
-CFLAGS += -DCONFIG_WNM
-CFLAGS += -DCONFIG_INTERWORKING
-CFLAGS += -DCONFIG_GAS
-CFLAGS += -DCONFIG_HS20
-CFLAGS += -DIEEE8021X_EAPOL
-CFLAGS += -DNEED_AP_MLME
-CFLAGS += -DCONFIG_AIRTIME_POLICY
-
-$(SRC)/utils/libutils.a:
-	$(MAKE) -C $(SRC)/utils
-
-$(SRC)/common/libcommon.a:
-	$(MAKE) -C $(SRC)/common
-
-$(SRC)/crypto/libcrypto.a:
-	$(MAKE) -C $(SRC)/crypto
-
-$(SRC)/tls/libtls.a:
-	$(MAKE) -C $(SRC)/tls
-
-$(SRC)/wps/libwps.a:
-	$(MAKE) -C $(SRC)/wps
-
-$(SRC)/eap_common/libeap_common.a:
-	$(MAKE) -C $(SRC)/eap_common
-
-$(SRC)/eap_server/libeap_server.a:
-	$(MAKE) -C $(SRC)/eap_server
-
-$(SRC)/l2_packet/libl2_packet.a:
-	$(MAKE) -C $(SRC)/l2_packet
-
-$(SRC)/eapol_auth/libeapol_auth.a:
-	$(MAKE) -C $(SRC)/eapol_auth
-
-$(SRC)/ap/libap.a:
-	$(MAKE) -C $(SRC)/ap
-
-$(SRC)/radius/libradius.a:
-	$(MAKE) -C $(SRC)/radius
-
-LIBS += $(SRC)/common/libcommon.a
-LIBS += $(SRC)/crypto/libcrypto.a
-LIBS += $(SRC)/tls/libtls.a
-LIBS += $(SRC)/wps/libwps.a
-LIBS += $(SRC)/eap_server/libeap_server.a
-LIBS += $(SRC)/eap_common/libeap_common.a
-LIBS += $(SRC)/l2_packet/libl2_packet.a
-LIBS += $(SRC)/ap/libap.a
-LIBS += $(SRC)/eapol_auth/libeapol_auth.a
-LIBS += $(SRC)/radius/libradius.a
-LIBS += $(SRC)/utils/libutils.a
-
-ELIBS += $(SRC)/crypto/libcrypto.a
-ELIBS += $(SRC)/tls/libtls.a
-
-ap-mgmt-fuzzer: ap-mgmt-fuzzer.o $(OBJS) $(LIBS)
-	$(LDO) $(LDFLAGS) -o $@ $^ $(LIBS) $(ELIBS)
-
-clean:
-	$(MAKE) -C $(SRC) clean
-	rm -f ap-mgmt-fuzzer *~ *.o *.d
-
--include $(OBJS:%.o=%.d)
diff --git a/tests/ap-mgmt-fuzzer/ap-mgmt-fuzzer.c b/tests/ap-mgmt-fuzzer/ap-mgmt-fuzzer.c
deleted file mode 100644
index 9d61b6bcc..000000000
--- a/tests/ap-mgmt-fuzzer/ap-mgmt-fuzzer.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * hostapd - Management frame fuzzer
- * Copyright (c) 2015, Jouni Malinen <j@w1.fi>
- *
- * This software may be distributed under the terms of the BSD license.
- * See README for more details.
- */
-
-#include "utils/includes.h"
-
-#include "utils/common.h"
-#include "utils/eloop.h"
-#include "ap/hostapd.h"
-#include "ap/hw_features.h"
-#include "ap/ieee802_11.h"
-#include "ap/sta_info.h"
-#include "ap/ap_list.h"
-
-
-const struct wpa_driver_ops *const wpa_drivers[] =
-{
-	NULL
-};
-
-
-struct arg_ctx {
-	const char *fname;
-	struct hostapd_iface iface;
-	struct hostapd_data hapd;
-	struct wpa_driver_ops driver;
-	struct hostapd_config iconf;
-	struct hostapd_bss_config conf;
-	int multi_frame;
-};
-
-
-static void test_send_mgmt(void *eloop_data, void *user_ctx)
-{
-	struct arg_ctx *ctx = eloop_data;
-	char *data;
-	size_t len;
-	struct hostapd_frame_info fi;
-
-	wpa_printf(MSG_INFO, "ap-mgmt-fuzzer: Send '%s'", ctx->fname);
-
-	data = os_readfile(ctx->fname, &len);
-	if (!data) {
-		wpa_printf(MSG_ERROR, "Could not read '%s'", ctx->fname);
-		goto out;
-	}
-
-	os_memset(&fi, 0, sizeof(fi));
-	if (ctx->multi_frame) {
-		u8 *pos, *end;
-
-		pos = (u8 *) data;
-		end = pos + len;
-
-		while (end - pos > 2) {
-			u16 flen;
-
-			flen = WPA_GET_BE16(pos);
-			pos += 2;
-			if (end - pos < flen)
-				break;
-			wpa_hexdump(MSG_MSGDUMP, "fuzzer - frame", pos, flen);
-			ieee802_11_mgmt(&ctx->hapd, pos, flen, &fi);
-			pos += flen;
-		}
-	} else {
-		wpa_hexdump(MSG_MSGDUMP, "fuzzer - WNM", data, len);
-		ieee802_11_mgmt(&ctx->hapd, (u8 *) data, len, &fi);
-	}
-
-out:
-	os_free(data);
-	eloop_terminate();
-}
-
-
-static struct hostapd_hw_modes * gen_modes(void)
-{
-	struct hostapd_hw_modes *mode;
-	struct hostapd_channel_data *chan;
-
-	mode = os_zalloc(sizeof(struct hostapd_hw_modes));
-	if (!mode)
-		return NULL;
-
-	mode->mode = HOSTAPD_MODE_IEEE80211G;
-	chan = os_zalloc(sizeof(struct hostapd_channel_data));
-	if (!chan) {
-		os_free(mode);
-		return NULL;
-	}
-	chan->chan = 1;
-	chan->freq = 2412;
-	mode->channels = chan;
-	mode->num_channels = 1;
-
-	mode->rates = os_zalloc(sizeof(int));
-	if (!mode->rates) {
-		os_free(chan);
-		os_free(mode);
-		return NULL;
-	}
-	mode->rates[0] = 10;
-	mode->num_rates = 1;
-
-	return mode;
-}
-
-
-static int init_hapd(struct arg_ctx *ctx)
-{
-	struct hostapd_data *hapd = &ctx->hapd;
-	struct sta_info *sta;
-	struct hostapd_bss_config *bss;
-
-	hapd->driver = &ctx->driver;
-	os_memcpy(hapd->own_addr, "\x02\x00\x00\x00\x03\x00", ETH_ALEN);
-	hapd->iface = &ctx->iface;
-	hapd->iface->conf = hostapd_config_defaults();
-	if (!hapd->iface->conf)
-		return -1;
-	hapd->iface->hw_features = gen_modes();
-	hapd->iface->num_hw_features = 1;
-	hapd->iface->current_mode = hapd->iface->hw_features;
-	hapd->iconf = hapd->iface->conf;
-	hapd->iconf->hw_mode = HOSTAPD_MODE_IEEE80211G;
-	hapd->iconf->channel = 1;
-	bss = hapd->conf = hapd->iconf->bss[0];
-	hostapd_config_defaults_bss(hapd->conf);
-	os_memcpy(bss->ssid.ssid, "test", 4);
-	bss->ssid.ssid_len = 4;
-	bss->ssid.ssid_set = 1;
-
-	sta = ap_sta_add(hapd, (u8 *) "\x02\x00\x00\x00\x00\x00");
-	if (sta)
-		sta->flags |= WLAN_STA_ASSOC | WLAN_STA_WMM;
-
-	return 0;
-}
-
-
-int main(int argc, char *argv[])
-{
-	struct arg_ctx ctx;
-	int ret = -1;
-
-	if (argc < 2) {
-		printf("usage: %s [-m] <file>\n", argv[0]);
-		return -1;
-	}
-
-	if (os_program_init())
-		return -1;
-
-	wpa_debug_level = 0;
-	wpa_debug_show_keys = 1;
-
-	if (eloop_init()) {
-		wpa_printf(MSG_ERROR, "Failed to initialize event loop");
-		return -1;
-	}
-
-	os_memset(&ctx, 0, sizeof(ctx));
-	if (argc >= 3 && os_strcmp(argv[1], "-m") == 0) {
-		ctx.multi_frame = 1;
-		ctx.fname = argv[2];
-	} else {
-		ctx.fname = argv[1];
-	}
-	if (init_hapd(&ctx))
-		goto fail;
-
-	eloop_register_timeout(0, 0, test_send_mgmt, &ctx, NULL);
-
-	wpa_printf(MSG_DEBUG, "Starting eloop");
-	eloop_run();
-	wpa_printf(MSG_DEBUG, "eloop done");
-	hostapd_free_stas(&ctx.hapd);
-	hostapd_free_hw_features(ctx.hapd.iface->hw_features,
-				 ctx.hapd.iface->num_hw_features);
-
-	ret = 0;
-fail:
-	hostapd_config_free(ctx.hapd.iconf);
-	ap_list_deinit(&ctx.iface);
-	eloop_destroy();
-	os_program_deinit();
-
-	return ret;
-}
diff --git a/tests/ap-mgmt-fuzzer/auth.dat b/tests/ap-mgmt-fuzzer/auth.dat
deleted file mode 100644
index 0eb36e5aa..000000000
Binary files a/tests/ap-mgmt-fuzzer/auth.dat and /dev/null differ
diff --git a/tests/ap-mgmt-fuzzer/multi.dat b/tests/ap-mgmt-fuzzer/multi.dat
deleted file mode 100644
index 29d074e0c..000000000
Binary files a/tests/ap-mgmt-fuzzer/multi.dat and /dev/null differ
diff --git a/tests/ap-mgmt-fuzzer/probe-req.dat b/tests/ap-mgmt-fuzzer/probe-req.dat
deleted file mode 100644
index a5fba77ad..000000000
Binary files a/tests/ap-mgmt-fuzzer/probe-req.dat and /dev/null differ