diff --git a/test/controls_haiku.c b/test/controls_haiku.c
new file mode 100644
index 00000000..eedc4131
--- /dev/null
+++ b/test/controls_haiku.c
@@ -0,0 +1,25 @@
+// 18 january 2020
+#include "test_haiku.h"
+
+static const uiControlOSVtable osVtable = {
+	.Size = sizeof (uiControlOSVtable),
+};
+
+const uiControlOSVtable *testOSVtable(void)
+{
+	return &osVtable;
+}
+
+Test(WrongControlOSVtableSizeIsProgrammerError)
+{
+	uiControlVtable vtable;
+	uiControlOSVtable osvt;
+	void *ctx;
+
+	testControlLoadNopVtable(&vtable);
+	ctx = beginCheckProgrammerError("uiRegisterControlType(): wrong size 1 for uiControlOSVtable");
+	memset(&osvt, 0, sizeof (uiControlOSVtable));
+	osvt.Size = 1;
+	uiRegisterControlType("name", &vtable, &osvt, 0);
+	endCheckProgrammerError(ctx);
+}
diff --git a/test/meson.build b/test/meson.build
index 5a2dece3..98ec0662 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -17,6 +17,10 @@ elif libui_OS == 'darwin'
 	libui_test_sources += files([
 		'controls_darwin.m',
 	])
+elif libui_OS == 'haiku'
+	libui_test_sources += files([
+		'controls_haiku.c',
+	])
 else
 	libui_test_sources += files([
 		'controls_unix.c',
diff --git a/zNEW_test/test_haiku.h b/test/test_haiku.h
similarity index 100%
rename from zNEW_test/test_haiku.h
rename to test/test_haiku.h
diff --git a/zNEW_test/controls_haiku.c b/zNEW_test/controls_haiku.c
deleted file mode 100644
index cfd6c8c1..00000000
--- a/zNEW_test/controls_haiku.c
+++ /dev/null
@@ -1,11 +0,0 @@
-// 18 january 2020
-#include "test_haiku.h"
-
-static const uiControlOSVtable vtable = {
-	.Size = sizeof (uiControlOSVtable),
-};
-
-const uiControlOSVtable *testOSVtable(void)
-{
-	return &vtable;
-}
diff --git a/zNEW_test/controls_haiku_errors.cpp b/zNEW_test/controls_haiku_errors.cpp
deleted file mode 100644
index 6a2d26fe..00000000
--- a/zNEW_test/controls_haiku_errors.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// 18 january 2020
-#include "test_haiku.h"
-
-const struct checkErrorCase controlOSVtableCases[] = {
-	{
-		"uiRegisterControlType() with OS vtable with wrong size",
-		[](void) {
-			uiControlOSVtable vtable;
-		
-			memset(&vtable, 0, sizeof (uiControlOSVtable));
-			vtable.Size = 1;
-			uiRegisterControlType("name", testVtable(), &vtable, 0);
-		},
-		"uiRegisterControlType(): wrong size 1 for uiControlOSVtable",
-	},
-	{ NULL, NULL, NULL },
-};