diff --git a/Makefile.in b/Makefile.in
index 9bf9422ce..da59bcc10 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -316,6 +316,8 @@ clean:	regressclean
 	rm -f regress/unittests/kex/test_kex$(EXEEXT)
 	rm -f regress/unittests/match/*.o
 	rm -f regress/unittests/match/test_match$(EXEEXT)
+	rm -f regress/unittests/crypto/*.o
+	rm -f regress/unittests/crypto/test_crypto$(EXEEXT)
 	rm -f regress/unittests/misc/*.o
 	rm -f regress/unittests/misc/test_misc$(EXEEXT)
 	rm -f regress/unittests/servconf/*.o
@@ -357,6 +359,8 @@ distclean:	regressclean
 	rm -f regress/unittests/kex/test_kex
 	rm -f regress/unittests/match/*.o
 	rm -f regress/unittests/match/test_match
+	rm -f regress/unittests/crypto/*.o
+	rm -f regress/unittests/crypto/test_crypto
 	rm -f regress/unittests/misc/*.o
 	rm -f regress/unittests/misc/test_misc
 	rm -f regress/unittests/servconf/*.o
@@ -543,6 +547,7 @@ regress-prep:
 	$(MKDIR_P) `pwd`/regress/unittests/hostkeys
 	$(MKDIR_P) `pwd`/regress/unittests/kex
 	$(MKDIR_P) `pwd`/regress/unittests/match
+	$(MKDIR_P) `pwd`/regress/unittests/crypto
 	$(MKDIR_P) `pwd`/regress/unittests/misc
 	$(MKDIR_P) `pwd`/regress/unittests/servconf
 	$(MKDIR_P) `pwd`/regress/unittests/sshbuf
@@ -695,6 +700,21 @@ regress/unittests/match/test_match$(EXEEXT): \
 	    regress/unittests/test_helper/libtest_helper.a \
 	    -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(TESTLIBS)
 
+UNITTESTS_TEST_CRYPTO_OBJS=\
+	regress/unittests/crypto/test_ed25519.o \
+	regress/unittests/crypto/test_mldsa.o \
+	regress/unittests/crypto/test_mldsa_eddsa.o \
+	regress/unittests/crypto/test_mlkem.o \
+	regress/unittests/crypto/tests.o \
+	$(P11OBJS) $(SKOBJS)
+
+regress/unittests/crypto/test_crypto$(EXEEXT): \
+    ${UNITTESTS_TEST_CRYPTO_OBJS} \
+    regress/unittests/test_helper/libtest_helper.a libssh.a
+	$(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_CRYPTO_OBJS) \
+	    regress/unittests/test_helper/libtest_helper.a \
+	    -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(TESTLIBS)
+
 UNITTESTS_TEST_MISC_OBJS=\
 	regress/unittests/misc/tests.o \
 	regress/unittests/misc/test_parse.o \
@@ -778,6 +798,7 @@ regress-unit-binaries: regress-prep $(REGRESSLIBS) \
 	regress/unittests/hostkeys/test_hostkeys$(EXEEXT) \
 	regress/unittests/kex/test_kex$(EXEEXT) \
 	regress/unittests/match/test_match$(EXEEXT) \
+	regress/unittests/crypto/test_crypto$(EXEEXT) \
 	regress/unittests/misc/test_misc$(EXEEXT) \
 	regress/unittests/servconf/test_servconf$(EXEEXT) \
 	regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \
diff --git a/regress/Makefile b/regress/Makefile
index 9120f1758..a6f81bef4 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -309,6 +309,8 @@ unit unit-bench:
 		$$V ${.OBJDIR}/unittests/match/test_match $${ARGS}; \
 		$$V ${.OBJDIR}/unittests/misc/test_misc $${ARGS}; \
 		$$V ${.OBJDIR}/unittests/servconf/test_servconf $${ARGS}; \
+		$$V ${.OBJDIR}/unittests/crypto/test_crypto \
+			-d ${.CURDIR}/unittests/crypto/testdata $${ARGS}; \
 		if test "x${TEST_SSH_UTF8}" = "xyes"  ; then \
 			$$V ${.OBJDIR}/unittests/utf8/test_utf8 $${ARGS}; \
 		fi \
diff --git a/regress/unittests/crypto/test_ed25519.c b/regress/unittests/crypto/test_ed25519.c
index 5c554ace5..cc9ea3b86 100644
--- a/regress/unittests/crypto/test_ed25519.c
+++ b/regress/unittests/crypto/test_ed25519.c
@@ -5,6 +5,8 @@
  * Placed in the public domain
  */
 
+#include "includes.h"
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdint.h>
diff --git a/regress/unittests/crypto/test_mldsa.c b/regress/unittests/crypto/test_mldsa.c
index c9c796d79..c21179130 100644
--- a/regress/unittests/crypto/test_mldsa.c
+++ b/regress/unittests/crypto/test_mldsa.c
@@ -5,6 +5,8 @@
  * Placed in the public domain
  */
 
+#include "includes.h"
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdint.h>
diff --git a/regress/unittests/crypto/test_mldsa_eddsa.c b/regress/unittests/crypto/test_mldsa_eddsa.c
index b9549e94d..655e421b8 100644
--- a/regress/unittests/crypto/test_mldsa_eddsa.c
+++ b/regress/unittests/crypto/test_mldsa_eddsa.c
@@ -5,6 +5,8 @@
  * Placed in the public domain
  */
 
+#include "includes.h"
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdint.h>
diff --git a/regress/unittests/crypto/test_mlkem.c b/regress/unittests/crypto/test_mlkem.c
index 9cd7183e2..148469892 100644
--- a/regress/unittests/crypto/test_mlkem.c
+++ b/regress/unittests/crypto/test_mlkem.c
@@ -5,6 +5,8 @@
  * Placed in the public domain
  */
 
+#include "includes.h"
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdint.h>
diff --git a/regress/unittests/crypto/tests.c b/regress/unittests/crypto/tests.c
index 53a44fb0e..9061e332e 100644
--- a/regress/unittests/crypto/tests.c
+++ b/regress/unittests/crypto/tests.c
@@ -5,6 +5,8 @@
  * Placed in the public domain
  */
 
+#include "includes.h"
+
 #include <string.h>
 #include <ctype.h>