diff --git a/ssl/heartbeat_test.c b/ssl/heartbeat_test.c
index eb08ee6b0d24856130dc94ca978c646e7c813a3d..35985f836c9b6e0206e3c07d3cc117c94060c202 100644
--- a/ssl/heartbeat_test.c
+++ b/ssl/heartbeat_test.c
@@ -45,10 +45,10 @@
 #include <string.h>
 
 /* As per https://tools.ietf.org/html/rfc6520#section-4 */
-static const int MIN_PADDING_SIZE = 16;
+#define MIN_PADDING_SIZE	16
 
 /* Maximum number of payload characters to print as test output */
-static const int MAX_PRINTABLE_CHARACTERS = 1024;
+#define MAX_PRINTABLE_CHARACTERS	1024
 
 typedef struct heartbeat_test_fixture
 	{
diff --git a/test/Makefile b/test/Makefile
index e016d71a9c3ffe401a2d5978fbb896968a1472f2..66ce1a1bbd515cef9fde4380b8ebd51bab4a80dd 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -85,7 +85,7 @@ FIPS_ECDSAVS=	fips_ecdsavs
 FIPS_TEST_SUITE=fips_test_suite
 FIPS_CMACTEST=	fips_cmactest
 FIPS_ALGVS=	fips_algvs
-HEARTBEATTEST = heartbeat_test
+HEARTBEATTEST=  heartbeat_test
 
 TESTS=		alltests
 
@@ -379,7 +379,7 @@ test_ocsp: ../apps/openssl$(EXE_EXT) tocsp
 	@sh ./tocsp
 
 test_heartbeat: $(HEARTBEATTEST)$(EXE_EXT)
-	./$<
+	../util/shlib_wrap.sh ./$(HEARTBEATTEST)
 
 lint:
 	lint -DLINT $(INCLUDES) $(SRC)>fluff