diff --git a/payloads/libpayload/tests/Makefile b/payloads/libpayload/tests/Makefile
deleted file mode 100644
index 8c55053af7..0000000000
--- a/payloads/libpayload/tests/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-CC=gcc -g -m32
-INCLUDES=-I. -I../include -I../include/x86
-TARGETS=cbfs-x86-test
-
-cbfs-x86-test: cbfs-x86-test.c ../arch/x86/rom_media.c ../libcbfs/ram_media.c ../libcbfs/cbfs.c
-	$(CC) -o $@ $^ $(INCLUDES)
-
-
-all: $(TARGETS)
-
-run: all
-	for i in $(TARGETS); do ./$$i; done
diff --git a/payloads/libpayload/tests/cbfs-x86-test.c b/payloads/libpayload/tests/cbfs-x86-test.c
deleted file mode 100644
index 81029656fc..0000000000
--- a/payloads/libpayload/tests/cbfs-x86-test.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* system headers */
-#include <stdlib.h>
-#include <stdio.h>
-
-/* libpayload headers */
-#include "cbfs.h"
-
-int fail(const char* str)
-{
-	fprintf(stderr, "%s", str);
-	exit(1);
-}
-
-int main(int argc, char** argv)
-{
-	FILE *cbfs = fopen("data/cbfs-x86.bin", "rb");
-	if (!cbfs) fail("could not open test file\n");
-	if (fseek(cbfs, 0, SEEK_END) != 0) fail("seek to end failed\n");
-
-	long size = ftell(cbfs);
-	if (size == -1) fail("could not determine file size\n");
-	if (fseek(cbfs, 0, SEEK_SET) != 0) fail("seek to start failed\n");
-
-	void *data = malloc(size);
-	if (!data) fail("could not allocate buffer\n");
-
-	if (fread(data, size, 1, cbfs) != 1) fail("could not read data\n");
-	if (fclose(cbfs)) fail("could not close file\n");
-
-	if (setup_cbfs_from_ram(data, size) != 0) fail("could not setup CBFS in RAM\n");
-	struct cbfs_file *file = cbfs_find("foo");
-	if (file == NULL) fail("could not find file in CBFS\n");
-	exit(0);
-}