diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 787c955..0e5c4da 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -2,6 +2,7 @@ include_directories(
 	.
 	../crypto/modes
 	../crypto/asn1
+	../crypto/x509
 	../ssl
 	../tls
 	../apps/openssl
@@ -144,6 +145,13 @@ add_executable(configtest configtest.c)
 target_link_libraries(configtest ${OPENSSL_LIBS})
 add_test(configtest configtest)
 
+# constraints
+if(NOT BUILD_SHARED_LIBS)
+	add_executable(constraints constraints.c)
+	target_link_libraries(constraints ${OPENSSL_LIBS})
+	add_test(constraints constraints)
+endif()
+
 # cts128test
 add_executable(cts128test cts128test.c)
 target_link_libraries(cts128test ${OPENSSL_LIBS})
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 86db040..f340f78 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,6 +2,7 @@ include $(top_srcdir)/Makefile.am.common
 
 AM_CPPFLAGS += -I $(top_srcdir)/crypto/modes
 AM_CPPFLAGS += -I $(top_srcdir)/crypto/asn1
+AM_CPPFLAGS += -I $(top_srcdir)/crypto/x509
 AM_CPPFLAGS += -I $(top_srcdir)/ssl
 AM_CPPFLAGS += -I $(top_srcdir)/tls
 AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl
@@ -146,6 +147,11 @@ TESTS += configtest
 check_PROGRAMS += configtest
 configtest_SOURCES = configtest.c
 
+# constraints
+TESTS += constraints
+check_PROGRAMS += constraints
+constraints_SOURCES = constraints.c
+
 # cts128test
 TESTS += cts128test
 check_PROGRAMS += cts128test