diff --git a/Makefile b/Makefile
index 00de60823b..e4d98c93aa 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,7 @@ programs: lib mbedtls_test
 
 ssl-opt: lib mbedtls_test
 	$(MAKE) -C programs ssl-opt
+	$(MAKE) -C tests ssl-opt
 
 lib:
 	$(MAKE) -C library
diff --git a/tests/Makefile b/tests/Makefile
index e07ac610f4..1fa3e9aee3 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -55,10 +55,14 @@ GENERATED_DATA_FILES += $(GENERATED_PSA_DATA_FILES)
 GENERATED_FILES = $(GENERATED_DATA_FILES)
 GENERATED_FILES += src/test_keys.h src/test_certs.h
 
+# Generated files needed to (fully) run ssl-opt.sh
+.PHONY: ssl-opt
+
 opt-testcases/tls13-compat.sh: scripts/generate_tls13_compat_tests.py
 	echo "  Gen   $@"
 	$(PYTHON) scripts/generate_tls13_compat_tests.py -o $@
 GENERATED_FILES += opt-testcases/tls13-compat.sh
+ssl-opt: opt-testcases/tls13-compat.sh
 
 .PHONY: generated_files
 generated_files: $(GENERATED_FILES)