diff -up nss/gtests/manifest.mn.skip-util-gtests nss/gtests/manifest.mn

--- nss/gtests/manifest.mn.skip-util-gtests	2017-01-30 02:06:08.000000000 +0100

+++ nss/gtests/manifest.mn	2017-02-17 12:55:55.064026636 +0100

@@ -9,7 +9,6 @@ DIRS = \

 	google_test \

 	common \

 	der_gtest \

-	util_gtest \

 	pk11_gtest \

 	ssl_gtest \

         nss_bogo_shim \

diff -up nss/gtests/ssl_gtest/manifest.mn.skip-util-gtests nss/gtests/ssl_gtest/manifest.mn

--- nss/gtests/ssl_gtest/manifest.mn.skip-util-gtests	2017-02-17 12:55:55.063026657 +0100

+++ nss/gtests/ssl_gtest/manifest.mn	2017-02-17 12:55:55.064026636 +0100

@@ -48,6 +48,6 @@ REQUIRES = nspr nss libdbm gtest

 PROGRAM = ssl_gtest

 EXTRA_LIBS = $(DIST)/lib/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) \

-             $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX)

+             -lsoftokn3

 USE_STATIC_LIBS = 1

diff -up nss/tests/gtests/gtests.sh.skip-util-gtests nss/tests/gtests/gtests.sh

--- nss/tests/gtests/gtests.sh.skip-util-gtests	2017-02-17 12:56:49.434880888 +0100

+++ nss/tests/gtests/gtests.sh	2017-02-17 12:56:54.677770408 +0100

@@ -82,7 +82,7 @@ gtest_cleanup()

 }

 ################## main #################################################

-GTESTS="der_gtest pk11_gtest util_gtest"

+GTESTS="der_gtest pk11_gtest"

 gtest_init $0

 gtest_start

 gtest_cleanup