diff --git a/programs/Makefile b/programs/Makefile
index a3fa81679f..ebdadc0567 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -139,7 +139,7 @@ APPS = \
 	x509/req_app \
 # End of APPS
 
-ifdef PTHREAD
+ifeq ($(THREADING),pthread)
 APPS +=	ssl/ssl_pthread_server
 endif
 
diff --git a/tests/Makefile b/tests/Makefile
index 72429a6429..29197b7c71 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -58,7 +58,7 @@ DLEXT ?= so
 EXEXT=
 SHARED_SUFFIX=
 
-ifdef PTHREAD
+ifeq ($(THREADING),pthread)
 LOCAL_LDFLAGS += -lpthread
 endif
 endif
diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 65203e8771..933c563d30 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -218,7 +218,7 @@ pre_initialize_variables () {
     done
 
     # Option to enable linking with pthreads under make
-    MAKE_THREADING_FLAGS="PTHREAD=1"
+    MAKE_THREADING_FLAGS="THREADING=pthread"
 }
 
 # Test whether the component $1 is included in the command line patterns.