diff --git a/tests/gadget-zero/Makefile.stm32f103-generic b/tests/gadget-zero/Makefile.stm32f103-generic
new file mode 100644
index 0000000000..6ef881f02f
--- /dev/null
+++ b/tests/gadget-zero/Makefile.stm32f103-generic
@@ -0,0 +1,42 @@
+##
+## This file is part of the libopencm3 project.
+##
+## This library is free software: you can redistribute it and/or modify
+## it under the terms of the GNU Lesser General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public License
+## along with this library.  If not, see <http://www.gnu.org/licenses/>.
+##
+
+BOARD = stm32f103-generic
+PROJECT = usb-gadget0-$(BOARD)
+BUILD_DIR = bin-$(BOARD)
+
+SHARED_DIR = ../shared
+
+CFILES = main-$(BOARD).c
+CFILES += usb-gadget0.c trace.c trace_stdio.c
+
+VPATH += $(SHARED_DIR)
+
+INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR))
+
+OPENCM3_DIR=../../
+
+### This section can go to an arch shared rules eventually...
+LDSCRIPT = ../../lib/stm32/f1/stm32f103x8.ld
+OPENCM3_LIB = opencm3_stm32f1
+OPENCM3_DEFS = -DSTM32F1
+ARCH_FLAGS = -mthumb -mcpu=cortex-m3
+#OOCD_INTERFACE = jlink
+#OOCD_TARGET = stm32f1x
+OOCD_FILE = openocd.stm32f103-generic.cfg
+
+include ../rules.mk
diff --git a/tests/gadget-zero/main-stm32f103-generic.c b/tests/gadget-zero/main-stm32f103-generic.c
new file mode 100644
index 0000000000..10bc273056
--- /dev/null
+++ b/tests/gadget-zero/main-stm32f103-generic.c
@@ -0,0 +1,69 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2015 Karl Palsson <karlp@tweak.net.au>
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <libopencm3/cm3/nvic.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/rcc.h>
+
+#include <stdio.h>
+#include "usb-gadget0.h"
+
+#define ER_DEBUG
+#ifdef ER_DEBUG
+#define ER_DPRINTF(fmt, ...) \
+    do { printf(fmt, ## __VA_ARGS__); } while (0)
+#else
+#define ER_DPRINTF(fmt, ...) \
+    do { } while (0)
+#endif
+
+int main(void)
+{
+	rcc_clock_setup_in_hse_8mhz_out_72mhz();
+	/* LED to indicate boot process */
+	rcc_periph_clock_enable(RCC_GPIOC);
+	gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
+		GPIO_CNF_OUTPUT_PUSHPULL, GPIO13);
+	gpio_set(GPIOC, GPIO13);
+
+	rcc_periph_clock_enable(RCC_GPIOA);
+	/*
+	 * Vile hack to reenumerate, physically _drag_ d+ low.
+	 * do NOT do this if you're board has proper usb pull up control!
+	 * (need at least 2.5us to trigger usb disconnect)
+	 */
+	gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
+		GPIO_CNF_OUTPUT_PUSHPULL, GPIO12);
+	gpio_clear(GPIOA, GPIO11);
+	for (unsigned int i = 0; i < 800000; i++)
+		__asm__("nop");
+
+	rcc_periph_clock_enable(RCC_OTGFS);
+
+
+	usbd_device *usbd_dev = gadget0_init(&stm32f103_usb_driver, "stm32f103-generic");
+
+	ER_DPRINTF("bootup complete\n");
+	gpio_clear(GPIOC, GPIO13);
+	while (1) {
+		usbd_poll(usbd_dev);
+	}
+
+}
+
diff --git a/tests/gadget-zero/openocd.stm32f103-generic.cfg b/tests/gadget-zero/openocd.stm32f103-generic.cfg
new file mode 100644
index 0000000000..4a0d6d3719
--- /dev/null
+++ b/tests/gadget-zero/openocd.stm32f103-generic.cfg
@@ -0,0 +1,15 @@
+# Unfortunately, with no f103 disco, we're currently
+# using a separate disco board
+source [find interface/stlink-v2.cfg]
+set WORKAREASIZE 0x2000
+source [find target/stm32f1x.cfg]
+
+# Serial of my l1 disco used as stlink here.
+hla_serial "S?l\x06H?WQ%\x10\x18?"
+
+tpiu config internal swodump.stm32f103-generic.log uart off 72000000
+
+# Uncomment to reset on connect, for grabbing under WFI et al
+reset_config srst_only srst_nogate
+# reset_config srst_only srst_nogate connect_assert_srst
+
diff --git a/tests/gadget-zero/test_gadget0.py b/tests/gadget-zero/test_gadget0.py
index 09db75965d..226ecb8bfa 100644
--- a/tests/gadget-zero/test_gadget0.py
+++ b/tests/gadget-zero/test_gadget0.py
@@ -7,6 +7,7 @@
 import unittest
 
 DUT_SERIAL = "stm32f4disco"
+#DUT_SERIAL = "stm32f103-generic"
 
 class find_by_serial(object):
     def __init__(self, serial):