diff --git a/tests/Makefile.am b/tests/Makefile.am
index d925138..30040f0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,7 +11,6 @@ check_PROGRAMS = \
 	test_pkt_normalizer_standalone \
 	test_etcp_api \
 	test_ll_queue \
-	test_ecc_encrypt \
 	test_intensive_memory_pool \
 	test_memory_pool_and_config \
 	test_packet_dump \
@@ -25,10 +24,10 @@ check_PROGRAMS = \
 	bench_timeout_heap \
 	bench_uasync_timeouts
 
-# test_crypto only needed for TinyCrypt (not when using OpenSSL)
+# test_crypto and test_ecc_encrypt only needed for TinyCrypt (not when using OpenSSL)
 if USE_OPENSSL
 else
-check_PROGRAMS += test_crypto
+check_PROGRAMS += test_crypto test_ecc_encrypt
 endif
 
 # Basic includes
@@ -170,9 +169,12 @@ test_ll_queue_SOURCES = test_ll_queue.c
 test_ll_queue_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/lib
 test_ll_queue_LDADD = $(COMMON_LIBS)
 
+if USE_OPENSSL
+else
 test_ecc_encrypt_SOURCES = test_ecc_encrypt.c
 test_ecc_encrypt_CFLAGS = -I$(top_srcdir)/tinycrypt/lib/include -I$(top_srcdir)/tinycrypt/lib/source -I$(top_srcdir)/lib
 test_ecc_encrypt_LDADD = $(SECURE_CHANNEL_OBJS) $(CRYPTO_LIBS) $(COMMON_LIBS) -lcrypto
+endif
 
 test_intensive_memory_pool_SOURCES = test_intensive_memory_pool.c
 test_intensive_memory_pool_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/lib