diff -up nss/cmd/Makefile.nosoftokentests nss/cmd/Makefile
--- nss/cmd/Makefile.nosoftokentests	2013-05-30 23:43:20.982027783 -0700
+++ nss/cmd/Makefile	2013-05-30 23:47:11.865874884 -0700
@@ -19,9 +19,15 @@ BLTEST_SRCDIR =
 FIPSTEST_SRCDIR =
 SHLIBSIGN_SRCDIR =
 else
+ifeq ($(NSS_BUILD_WITHOUT_SOFTOKEN),1)
+BLTEST_SRCDIR =
+FIPSTEST_SRCDIR =
+SHLIBSIGN_SRCDIR =
+else
 BLTEST_SRCDIR = bltest
 FIPSTEST_SRCDIR = fipstest
 SHLIBSIGN_SRCDIR = shlibsign
+endif
 endif
 
 LOWHASHTEST_SRCDIR=