diff --git a/test/Makefile b/test/Makefile
index ed5948b..6cdcd47 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -16,7 +16,7 @@ VASM=vasm6502_std
 VASMFLAGS=-Fbin -wdc02
 UTILS=utils.o
 
-TESTS=test_bus test_emulation test_stepping test_assemble test_interrupt test_debug test_device_serial
+TESTS=test_bus test_emulation test_stepping test_assemble test_interrupt test_debug 
 TESTROMS:=$(addsuffix .rom,$(basename $(wildcard *.s)))
 
 all : $(TESTS) $(TESTROMS)
diff --git a/test/test_device_serial.c b/test/test_device_serial.c
deleted file mode 100644
index aa6eaa8..0000000
--- a/test/test_device_serial.c
+++ /dev/null
@@ -1,66 +0,0 @@
-#include <atf-c.h>
-
-#include <stdio.h>
-#include <string.h>
-
-#include <utlist.h>
-
-#include "rk65c02.h"
-#include "bus.h"
-#include "utils.h"
-#include "device_serial.h"
-
-ATF_TC_WITHOUT_HEAD(device_serial_init);
-ATF_TC_BODY(device_serial_init, tc)
-{
-	bus_t b;
-	device_mapping_t *dm;
-	device_t *d, *d_ser;
-
-	b = bus_init_with_default_devs();
-
-	bus_device_add(&b, device_serial_init(), 0xE000);
-
-	bus_device_dump(&b);
-
-	LL_FOREACH(b.dm_head, dm) {
-		d = dm->dev;
-
-		if (dm->addr == 0xE000)
-			d_ser = d;
-	}
-
-	ATF_CHECK(strcmp("Serial", d_ser->name) == 0);
-
-	bus_finish(&b);
-}
-
-ATF_TC_WITHOUT_HEAD(device_serial_write1);
-ATF_TC_BODY(device_serial_write1, tc)
-{
-	bus_t b;
-	rk65c02emu_t e;
-
-	b = bus_init_with_default_devs();
-
-	bus_device_add(&b, device_serial_init(), 0xE000);
-	bus_device_dump(&b);
-
-	e = rk65c02_init(&b);
-
-	ATF_REQUIRE(rom_start(&e, "test_device_serial_write1.rom", tc));
-
-	// start thread reading from txpipe
-
-	/* clean up serial etc. */
-	bus_finish(&b);
-}
-
-ATF_TP_ADD_TCS(tp)
-{
-	ATF_TP_ADD_TC(tp, device_serial_init);
-	ATF_TP_ADD_TC(tp, device_serial_write1);
-
-	return (atf_no_error());
-}
-
diff --git a/test/test_device_serial_write1.s b/test/test_device_serial_write1.s
deleted file mode 100644
index 799928d..0000000
--- a/test/test_device_serial_write1.s
+++ /dev/null
@@ -1,6 +0,0 @@
-start:  lda #0x61
-	sta 0xE000
-	lda #0x0A
-	sta 0xE000
-	stp
-