diff --git a/src/crypto/Makefile.am b/src/crypto/Makefile.am
index 4dd851b..995c388 100644
--- a/src/crypto/Makefile.am
+++ b/src/crypto/Makefile.am
@@ -3,12 +3,22 @@ AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXF
 
 noinst_LIBRARIES = libmoshcrypto.a
 
-libmoshcrypto_a_SOURCES = \
+OCB_SRCS = \
 	ae.h \
+	ocb.cc
+
+libmoshcrypto_a_SOURCES = \
+	$(OCB_SRCS) \
 	base64.cc \
 	base64.h \
 	byteorder.h \
 	crypto.cc \
 	crypto.h \
-	ocb.cc \
 	prng.h
+
+check_PROGRAMS = ocb-test
+TESTS = ocb-test
+
+ocb_test_SOURCES = $(OCB_SRCS)
+ocb_test_CPPFLAGS = -DOCB_TEST_PROGRAM
+ocb_test_LDADD = $(OPENSSL_LIBS)