2 files changed, 16 insertions, 5 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6bf3118..a01b771 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,6 +11,8 @@ LDADD += $(top_builddir)/ssl/libssl.la
 LDADD += $(top_builddir)/crypto/libcrypto.la
 LDADD += $(top_builddir)/tls/libtls.la
 
+TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh
+
 TESTS =
 check_PROGRAMS =
 EXTRA_DIST = CMakeLists.txt
@@ -259,15 +261,14 @@ check_PROGRAMS += rc4test
 rc4test_SOURCES = rc4test.c
 
 # rfc5280time
+check_PROGRAMS += rfc5280time
+rfc5280time_SOURCES = rfc5280time.c
 if SMALL_TIME_T
-TESTS += rfc5280time_too_small
-check_PROGRAMS += rfc5280time_too_small
-rfc5280time_too_small_SOURCES = rfc5280time.c
+TESTS += rfc5280time.test
 else
 TESTS += rfc5280time
-check_PROGRAMS += rfc5280time
-rfc5280time_SOURCES = rfc5280time.c
 endif
+EXTRA_DIST += rfc5280time.test
 
 # rmdtest
 TESTS += rmdtest
diff --git a/tests/rfc5280time.test b/tests/rfc5280time.test
new file mode 100755
index 0000000..3730597
--- /dev/null
+++ b/tests/rfc5280time.test
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+echo 1..2
+TEST=./rfc5280time
+if [ -e ./rfc5280time.exe ]; then
+        TEST=./rfc5280time.exe
+fi
+$TEST
+echo "ok 1"
+echo "ok 2 - rfc5280time_64-bit # SKIP this system is unable to represent times past 2038"