diff --git a/Makefile b/Makefile
index 01d2fcb..90ccfe1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #	$OpenBSD:$
 
-SUBDIR=	ssh regress regress-libopenssh
+SUBDIR=	ssh regress unittests
 
 .include <bsd.subdir.mk>
diff --git a/regress-libopenssh/Makefile b/unittests/Makefile
similarity index 100%
rename from regress-libopenssh/Makefile
rename to unittests/Makefile
diff --git a/regress-libopenssh/Makefile.inc b/unittests/Makefile.inc
similarity index 100%
rename from regress-libopenssh/Makefile.inc
rename to unittests/Makefile.inc
diff --git a/regress-libopenssh/sshbuf/Makefile b/unittests/sshbuf/Makefile
similarity index 100%
rename from regress-libopenssh/sshbuf/Makefile
rename to unittests/sshbuf/Makefile
diff --git a/regress-libopenssh/sshbuf/test_sshbuf.c b/unittests/sshbuf/test_sshbuf.c
similarity index 100%
rename from regress-libopenssh/sshbuf/test_sshbuf.c
rename to unittests/sshbuf/test_sshbuf.c
diff --git a/regress-libopenssh/sshbuf/test_sshbuf_fuzz.c b/unittests/sshbuf/test_sshbuf_fuzz.c
similarity index 100%
rename from regress-libopenssh/sshbuf/test_sshbuf_fuzz.c
rename to unittests/sshbuf/test_sshbuf_fuzz.c
diff --git a/regress-libopenssh/sshbuf/test_sshbuf_getput_basic.c b/unittests/sshbuf/test_sshbuf_getput_basic.c
similarity index 100%
rename from regress-libopenssh/sshbuf/test_sshbuf_getput_basic.c
rename to unittests/sshbuf/test_sshbuf_getput_basic.c
diff --git a/regress-libopenssh/sshbuf/test_sshbuf_getput_crypto.c b/unittests/sshbuf/test_sshbuf_getput_crypto.c
similarity index 100%
rename from regress-libopenssh/sshbuf/test_sshbuf_getput_crypto.c
rename to unittests/sshbuf/test_sshbuf_getput_crypto.c
diff --git a/regress-libopenssh/sshbuf/test_sshbuf_getput_fuzz.c b/unittests/sshbuf/test_sshbuf_getput_fuzz.c
similarity index 100%
rename from regress-libopenssh/sshbuf/test_sshbuf_getput_fuzz.c
rename to unittests/sshbuf/test_sshbuf_getput_fuzz.c
diff --git a/regress-libopenssh/sshbuf/test_sshbuf_misc.c b/unittests/sshbuf/test_sshbuf_misc.c
similarity index 100%
rename from regress-libopenssh/sshbuf/test_sshbuf_misc.c
rename to unittests/sshbuf/test_sshbuf_misc.c
diff --git a/regress-libopenssh/sshbuf/tests.c b/unittests/sshbuf/tests.c
similarity index 100%
rename from regress-libopenssh/sshbuf/tests.c
rename to unittests/sshbuf/tests.c
diff --git a/regress-libopenssh/test_helper/Makefile b/unittests/test_helper/Makefile
similarity index 100%
rename from regress-libopenssh/test_helper/Makefile
rename to unittests/test_helper/Makefile
diff --git a/regress-libopenssh/test_helper/test_helper.c b/unittests/test_helper/test_helper.c
similarity index 100%
rename from regress-libopenssh/test_helper/test_helper.c
rename to unittests/test_helper/test_helper.c
diff --git a/regress-libopenssh/test_helper/test_helper.h b/unittests/test_helper/test_helper.h
similarity index 100%
rename from regress-libopenssh/test_helper/test_helper.h
rename to unittests/test_helper/test_helper.h