--- a/Makefile
+++ b/Makefile
@@ -22,17 +22,17 @@ include $(CORE_DEPTH)/coreconf/config.mk
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
 ifdef NSS_DISABLE_GTESTS
-DIRS := $(filter-out external_tests,$(DIRS))
+DIRS := $(filter-out gtests,$(DIRS))
 endif
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 

--- a/automation/taskcluster/scripts/run_clang_format.sh
+++ b/automation/taskcluster/scripts/run_clang_format.sh
@@ -35,21 +35,21 @@ else
          "$top/lib/pkcs7" \
          "$top/lib/pkcs12" \
          "$top/lib/pki" \
          "$top/lib/smime" \
          "$top/lib/softoken" \
          "$top/lib/ssl" \
          "$top/lib/sysinit" \
          "$top/lib/util" \
-         "$top/external_tests/common" \
-         "$top/external_tests/der_gtest" \
-         "$top/external_tests/pk11_gtest" \
-         "$top/external_tests/ssl_gtest" \
-         "$top/external_tests/util_gtest" \
+         "$top/gtests/common" \
+         "$top/gtests/der_gtest" \
+         "$top/gtests/pk11_gtest" \
+         "$top/gtests/ssl_gtest" \
+         "$top/gtests/util_gtest" \
     )
 fi
 
 for dir in "${dirs[@]}"; do
     find "$dir" -type f \( -name '*.[ch]' -o -name '*.cc' \) -exec clang-format -i {} \+
 done
 
 TMPFILE=$(mktemp /tmp/$(basename $0).XXXXXX)

rename from external_tests/.clang-format
rename to gtests/.clang-format

rename from external_tests/Makefile
rename to gtests/Makefile

rename from external_tests/README
rename to gtests/README

rename from external_tests/common/Makefile
rename to gtests/common/Makefile

rename from external_tests/common/common.gyp
rename to gtests/common/common.gyp
--- a/external_tests/common/common.gyp
+++ b/gtests/common/common.gyp
@@ -14,23 +14,23 @@
         'gtests.cc'
       ],
       'dependencies': [
         '<(DEPTH)/exports.gyp:nss_exports',
         '<(DEPTH)/lib/nss/nss.gyp:nss3',
         '<(DEPTH)/lib/util/util.gyp:nssutil3',
         '<(DEPTH)/lib/smime/smime.gyp:smime3',
         '<(DEPTH)/lib/ssl/ssl.gyp:ssl3',
-        '<(DEPTH)/external_tests/google_test/google_test.gyp:gtest',
+        '<(DEPTH)/gtests/google_test/google_test.gyp:gtest',
         '<(DEPTH)/cmd/lib/lib.gyp:sectool'
       ]
     }
   ],
   'target_defaults': {
     'include_dirs': [
-      '../../external_tests/google_test/gtest/include',
-      '../../external_tests/common'
+      '../../gtests/google_test/gtest/include',
+      '../../gtests/common'
     ],
   },
   'variables': {
     'module': 'nss'
   }
 }

rename from external_tests/common/gtest.gypi
rename to gtests/common/gtest.gypi

rename from external_tests/common/gtest.mk
rename to gtests/common/gtest.mk

rename from external_tests/common/gtests.cc
rename to gtests/common/gtests.cc

rename from external_tests/common/manifest.mn
rename to gtests/common/manifest.mn
--- a/external_tests/common/manifest.mn
+++ b/gtests/common/manifest.mn
@@ -5,17 +5,17 @@
 CORE_DEPTH = ../..
 DEPTH      = ../..
 MODULE = nss
 
 CPPSRCS = \
       gtests.cc \
       $(NULL)
 
-INCLUDES += -I$(CORE_DEPTH)/external_tests/google_test/gtest/include \
-            -I$(CORE_DEPTH)/external_tests/common
+INCLUDES += -I$(CORE_DEPTH)/gtests/google_test/gtest/include \
+            -I$(CORE_DEPTH)/gtests/common
 
 REQUIRES = gtest
 
 EXTRA_LIBS = $(DIST)/lib/$(LIB_PREFIX)gtest.$(LIB_SUFFIX)
 
 # NOTE: this is not actually used but required to build gtests.o
-PROGRAM = gtests
\ No newline at end of file
+PROGRAM = gtests

rename from external_tests/common/scoped_ptrs.h
rename to gtests/common/scoped_ptrs.h

rename from external_tests/der_gtest/Makefile
rename to gtests/der_gtest/Makefile

rename from external_tests/der_gtest/der_getint_unittest.cc
rename to gtests/der_gtest/der_getint_unittest.cc

rename from external_tests/der_gtest/der_gtest.gyp
rename to gtests/der_gtest/der_gtest.gyp
--- a/external_tests/der_gtest/der_gtest.gyp
+++ b/gtests/der_gtest/der_gtest.gyp
@@ -7,26 +7,26 @@
     '../common/gtest.gypi',
   ],
   'targets': [
     {
       'target_name': 'der_gtest',
       'type': 'executable',
       'sources': [
         'der_getint_unittest.cc',
-        '<(DEPTH)/external_tests/common/gtests.cc'
+        '<(DEPTH)/gtests/common/gtests.cc'
       ],
       'dependencies': [
         '<(DEPTH)/exports.gyp:nss_exports',
-        '<(DEPTH)/external_tests/google_test/google_test.gyp:gtest',
+        '<(DEPTH)/gtests/google_test/google_test.gyp:gtest',
       ]
     }
   ],
   'target_defaults': {
     'include_dirs': [
-      '../../external_tests/google_test/gtest/include',
-      '../../external_tests/common'
+      '../../gtests/google_test/gtest/include',
+      '../../gtests/common'
     ]
   },
   'variables': {
     'module': 'nss'
   }
 }

rename from external_tests/der_gtest/der_private_key_import_unittest.cc
rename to gtests/der_gtest/der_private_key_import_unittest.cc

rename from external_tests/der_gtest/manifest.mn
rename to gtests/der_gtest/manifest.mn
--- a/external_tests/der_gtest/manifest.mn
+++ b/gtests/der_gtest/manifest.mn
@@ -6,17 +6,17 @@ CORE_DEPTH = ../..
 DEPTH      = ../..
 MODULE = nss
 
 CPPSRCS = \
       der_getint_unittest.cc \
       der_private_key_import_unittest.cc \
       $(NULL)
 
-INCLUDES += -I$(CORE_DEPTH)/external_tests/google_test/gtest/include \
-            -I$(CORE_DEPTH)/external_tests/common
+INCLUDES += -I$(CORE_DEPTH)/gtests/google_test/gtest/include \
+            -I$(CORE_DEPTH)/gtests/common
 
 REQUIRES = nspr nss libdbm gtest
 
 PROGRAM = der_gtest
 
 EXTRA_LIBS = $(DIST)/lib/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) $(EXTRA_OBJS) \
              ../common/$(OBJDIR)/gtests$(OBJ_SUFFIX)

rename from external_tests/google_test/Makefile
rename to gtests/google_test/Makefile

rename from external_tests/google_test/google_test.gyp
rename to gtests/google_test/google_test.gyp

rename from external_tests/google_test/gtest/CHANGES
rename to gtests/google_test/gtest/CHANGES

rename from external_tests/google_test/gtest/CMakeLists.txt
rename to gtests/google_test/gtest/CMakeLists.txt

rename from external_tests/google_test/gtest/CONTRIBUTORS
rename to gtests/google_test/gtest/CONTRIBUTORS

rename from external_tests/google_test/gtest/LICENSE
rename to gtests/google_test/gtest/LICENSE

rename from external_tests/google_test/gtest/Makefile.am
rename to gtests/google_test/gtest/Makefile.am

rename from external_tests/google_test/gtest/README
rename to gtests/google_test/gtest/README

rename from external_tests/google_test/gtest/build-aux/.keep
rename to gtests/google_test/gtest/build-aux/.keep

rename from external_tests/google_test/gtest/cmake/internal_utils.cmake
rename to gtests/google_test/gtest/cmake/internal_utils.cmake

rename from external_tests/google_test/gtest/codegear/gtest.cbproj
rename to gtests/google_test/gtest/codegear/gtest.cbproj

rename from external_tests/google_test/gtest/codegear/gtest.groupproj
rename to gtests/google_test/gtest/codegear/gtest.groupproj

rename from external_tests/google_test/gtest/codegear/gtest_all.cc
rename to gtests/google_test/gtest/codegear/gtest_all.cc

rename from external_tests/google_test/gtest/codegear/gtest_link.cc
rename to gtests/google_test/gtest/codegear/gtest_link.cc

rename from external_tests/google_test/gtest/codegear/gtest_main.cbproj
rename to gtests/google_test/gtest/codegear/gtest_main.cbproj

rename from external_tests/google_test/gtest/codegear/gtest_unittest.cbproj
rename to gtests/google_test/gtest/codegear/gtest_unittest.cbproj

rename from external_tests/google_test/gtest/configure.ac
rename to gtests/google_test/gtest/configure.ac

rename from external_tests/google_test/gtest/include/gtest/gtest-death-test.h
rename to gtests/google_test/gtest/include/gtest/gtest-death-test.h

rename from external_tests/google_test/gtest/include/gtest/gtest-message.h
rename to gtests/google_test/gtest/include/gtest/gtest-message.h

rename from external_tests/google_test/gtest/include/gtest/gtest-param-test.h
rename to gtests/google_test/gtest/include/gtest/gtest-param-test.h

rename from external_tests/google_test/gtest/include/gtest/gtest-param-test.h.pump
rename to gtests/google_test/gtest/include/gtest/gtest-param-test.h.pump

rename from external_tests/google_test/gtest/include/gtest/gtest-printers.h
rename to gtests/google_test/gtest/include/gtest/gtest-printers.h

rename from external_tests/google_test/gtest/include/gtest/gtest-spi.h
rename to gtests/google_test/gtest/include/gtest/gtest-spi.h

rename from external_tests/google_test/gtest/include/gtest/gtest-test-part.h
rename to gtests/google_test/gtest/include/gtest/gtest-test-part.h

rename from external_tests/google_test/gtest/include/gtest/gtest-typed-test.h
rename to gtests/google_test/gtest/include/gtest/gtest-typed-test.h

rename from external_tests/google_test/gtest/include/gtest/gtest.h
rename to gtests/google_test/gtest/include/gtest/gtest.h

rename from external_tests/google_test/gtest/include/gtest/gtest_pred_impl.h
rename to gtests/google_test/gtest/include/gtest/gtest_pred_impl.h

rename from external_tests/google_test/gtest/include/gtest/gtest_prod.h
rename to gtests/google_test/gtest/include/gtest/gtest_prod.h

rename from external_tests/google_test/gtest/include/gtest/internal/gtest-death-test-internal.h
rename to gtests/google_test/gtest/include/gtest/internal/gtest-death-test-internal.h

rename from external_tests/google_test/gtest/include/gtest/internal/gtest-filepath.h
rename to gtests/google_test/gtest/include/gtest/internal/gtest-filepath.h

rename from external_tests/google_test/gtest/include/gtest/internal/gtest-internal.h
rename to gtests/google_test/gtest/include/gtest/internal/gtest-internal.h

rename from external_tests/google_test/gtest/include/gtest/internal/gtest-linked_ptr.h
rename to gtests/google_test/gtest/include/gtest/internal/gtest-linked_ptr.h

rename from external_tests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h
rename to gtests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h

rename from external_tests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
rename to gtests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h.pump

rename from external_tests/google_test/gtest/include/gtest/internal/gtest-param-util.h
rename to gtests/google_test/gtest/include/gtest/internal/gtest-param-util.h

rename from external_tests/google_test/gtest/include/gtest/internal/gtest-port.h
rename to gtests/google_test/gtest/include/gtest/internal/gtest-port.h

rename from external_tests/google_test/gtest/include/gtest/internal/gtest-string.h
rename to gtests/google_test/gtest/include/gtest/internal/gtest-string.h

rename from external_tests/google_test/gtest/include/gtest/internal/gtest-tuple.h
rename to gtests/google_test/gtest/include/gtest/internal/gtest-tuple.h

rename from external_tests/google_test/gtest/include/gtest/internal/gtest-tuple.h.pump
rename to gtests/google_test/gtest/include/gtest/internal/gtest-tuple.h.pump

rename from external_tests/google_test/gtest/include/gtest/internal/gtest-type-util.h
rename to gtests/google_test/gtest/include/gtest/internal/gtest-type-util.h

rename from external_tests/google_test/gtest/include/gtest/internal/gtest-type-util.h.pump
rename to gtests/google_test/gtest/include/gtest/internal/gtest-type-util.h.pump

rename from external_tests/google_test/gtest/m4/acx_pthread.m4
rename to gtests/google_test/gtest/m4/acx_pthread.m4

rename from external_tests/google_test/gtest/m4/gtest.m4
rename to gtests/google_test/gtest/m4/gtest.m4

rename from external_tests/google_test/gtest/make/Makefile
rename to gtests/google_test/gtest/make/Makefile

rename from external_tests/google_test/gtest/msvc/gtest-md.sln
rename to gtests/google_test/gtest/msvc/gtest-md.sln

rename from external_tests/google_test/gtest/msvc/gtest-md.vcproj
rename to gtests/google_test/gtest/msvc/gtest-md.vcproj

rename from external_tests/google_test/gtest/msvc/gtest.sln
rename to gtests/google_test/gtest/msvc/gtest.sln

rename from external_tests/google_test/gtest/msvc/gtest.vcproj
rename to gtests/google_test/gtest/msvc/gtest.vcproj

rename from external_tests/google_test/gtest/msvc/gtest_main-md.vcproj
rename to gtests/google_test/gtest/msvc/gtest_main-md.vcproj

rename from external_tests/google_test/gtest/msvc/gtest_main.vcproj
rename to gtests/google_test/gtest/msvc/gtest_main.vcproj

rename from external_tests/google_test/gtest/msvc/gtest_prod_test-md.vcproj
rename to gtests/google_test/gtest/msvc/gtest_prod_test-md.vcproj

rename from external_tests/google_test/gtest/msvc/gtest_prod_test.vcproj
rename to gtests/google_test/gtest/msvc/gtest_prod_test.vcproj

rename from external_tests/google_test/gtest/msvc/gtest_unittest-md.vcproj
rename to gtests/google_test/gtest/msvc/gtest_unittest-md.vcproj

rename from external_tests/google_test/gtest/msvc/gtest_unittest.vcproj
rename to gtests/google_test/gtest/msvc/gtest_unittest.vcproj

rename from external_tests/google_test/gtest/samples/prime_tables.h
rename to gtests/google_test/gtest/samples/prime_tables.h

rename from external_tests/google_test/gtest/samples/sample1.cc
rename to gtests/google_test/gtest/samples/sample1.cc

rename from external_tests/google_test/gtest/samples/sample1.h
rename to gtests/google_test/gtest/samples/sample1.h

rename from external_tests/google_test/gtest/samples/sample10_unittest.cc
rename to gtests/google_test/gtest/samples/sample10_unittest.cc

rename from external_tests/google_test/gtest/samples/sample1_unittest.cc
rename to gtests/google_test/gtest/samples/sample1_unittest.cc

rename from external_tests/google_test/gtest/samples/sample2.cc
rename to gtests/google_test/gtest/samples/sample2.cc

rename from external_tests/google_test/gtest/samples/sample2.h
rename to gtests/google_test/gtest/samples/sample2.h

rename from external_tests/google_test/gtest/samples/sample2_unittest.cc
rename to gtests/google_test/gtest/samples/sample2_unittest.cc

rename from external_tests/google_test/gtest/samples/sample3-inl.h
rename to gtests/google_test/gtest/samples/sample3-inl.h

rename from external_tests/google_test/gtest/samples/sample3_unittest.cc
rename to gtests/google_test/gtest/samples/sample3_unittest.cc

rename from external_tests/google_test/gtest/samples/sample4.cc
rename to gtests/google_test/gtest/samples/sample4.cc

rename from external_tests/google_test/gtest/samples/sample4.h
rename to gtests/google_test/gtest/samples/sample4.h

rename from external_tests/google_test/gtest/samples/sample4_unittest.cc
rename to gtests/google_test/gtest/samples/sample4_unittest.cc

rename from external_tests/google_test/gtest/samples/sample5_unittest.cc
rename to gtests/google_test/gtest/samples/sample5_unittest.cc

rename from external_tests/google_test/gtest/samples/sample6_unittest.cc
rename to gtests/google_test/gtest/samples/sample6_unittest.cc

rename from external_tests/google_test/gtest/samples/sample7_unittest.cc
rename to gtests/google_test/gtest/samples/sample7_unittest.cc

rename from external_tests/google_test/gtest/samples/sample8_unittest.cc
rename to gtests/google_test/gtest/samples/sample8_unittest.cc

rename from external_tests/google_test/gtest/samples/sample9_unittest.cc
rename to gtests/google_test/gtest/samples/sample9_unittest.cc

rename from external_tests/google_test/gtest/scripts/common.py
rename to gtests/google_test/gtest/scripts/common.py

rename from external_tests/google_test/gtest/scripts/fuse_gtest_files.py
rename to gtests/google_test/gtest/scripts/fuse_gtest_files.py

rename from external_tests/google_test/gtest/scripts/gen_gtest_pred_impl.py
rename to gtests/google_test/gtest/scripts/gen_gtest_pred_impl.py

rename from external_tests/google_test/gtest/scripts/gtest-config.in
rename to gtests/google_test/gtest/scripts/gtest-config.in

rename from external_tests/google_test/gtest/scripts/pump.py
rename to gtests/google_test/gtest/scripts/pump.py

rename from external_tests/google_test/gtest/scripts/release_docs.py
rename to gtests/google_test/gtest/scripts/release_docs.py

rename from external_tests/google_test/gtest/scripts/test/Makefile
rename to gtests/google_test/gtest/scripts/test/Makefile

rename from external_tests/google_test/gtest/scripts/upload.py
rename to gtests/google_test/gtest/scripts/upload.py

rename from external_tests/google_test/gtest/scripts/upload_gtest.py
rename to gtests/google_test/gtest/scripts/upload_gtest.py

rename from external_tests/google_test/gtest/src/gtest-all.cc
rename to gtests/google_test/gtest/src/gtest-all.cc

rename from external_tests/google_test/gtest/src/gtest-death-test.cc
rename to gtests/google_test/gtest/src/gtest-death-test.cc

rename from external_tests/google_test/gtest/src/gtest-filepath.cc
rename to gtests/google_test/gtest/src/gtest-filepath.cc

rename from external_tests/google_test/gtest/src/gtest-internal-inl.h
rename to gtests/google_test/gtest/src/gtest-internal-inl.h

rename from external_tests/google_test/gtest/src/gtest-port.cc
rename to gtests/google_test/gtest/src/gtest-port.cc

rename from external_tests/google_test/gtest/src/gtest-printers.cc
rename to gtests/google_test/gtest/src/gtest-printers.cc

rename from external_tests/google_test/gtest/src/gtest-test-part.cc
rename to gtests/google_test/gtest/src/gtest-test-part.cc

rename from external_tests/google_test/gtest/src/gtest-typed-test.cc
rename to gtests/google_test/gtest/src/gtest-typed-test.cc

rename from external_tests/google_test/gtest/src/gtest.cc
rename to gtests/google_test/gtest/src/gtest.cc

rename from external_tests/google_test/gtest/src/gtest_main.cc
rename to gtests/google_test/gtest/src/gtest_main.cc

rename from external_tests/google_test/gtest/test/gtest-death-test_ex_test.cc
rename to gtests/google_test/gtest/test/gtest-death-test_ex_test.cc

rename from external_tests/google_test/gtest/test/gtest-death-test_test.cc
rename to gtests/google_test/gtest/test/gtest-death-test_test.cc

rename from external_tests/google_test/gtest/test/gtest-filepath_test.cc
rename to gtests/google_test/gtest/test/gtest-filepath_test.cc

rename from external_tests/google_test/gtest/test/gtest-linked_ptr_test.cc
rename to gtests/google_test/gtest/test/gtest-linked_ptr_test.cc

rename from external_tests/google_test/gtest/test/gtest-listener_test.cc
rename to gtests/google_test/gtest/test/gtest-listener_test.cc

rename from external_tests/google_test/gtest/test/gtest-message_test.cc
rename to gtests/google_test/gtest/test/gtest-message_test.cc

rename from external_tests/google_test/gtest/test/gtest-options_test.cc
rename to gtests/google_test/gtest/test/gtest-options_test.cc

rename from external_tests/google_test/gtest/test/gtest-param-test2_test.cc
rename to gtests/google_test/gtest/test/gtest-param-test2_test.cc

rename from external_tests/google_test/gtest/test/gtest-param-test_test.cc
rename to gtests/google_test/gtest/test/gtest-param-test_test.cc

rename from external_tests/google_test/gtest/test/gtest-param-test_test.h
rename to gtests/google_test/gtest/test/gtest-param-test_test.h

rename from external_tests/google_test/gtest/test/gtest-port_test.cc
rename to gtests/google_test/gtest/test/gtest-port_test.cc

rename from external_tests/google_test/gtest/test/gtest-printers_test.cc
rename to gtests/google_test/gtest/test/gtest-printers_test.cc

rename from external_tests/google_test/gtest/test/gtest-test-part_test.cc
rename to gtests/google_test/gtest/test/gtest-test-part_test.cc

rename from external_tests/google_test/gtest/test/gtest-tuple_test.cc
rename to gtests/google_test/gtest/test/gtest-tuple_test.cc

rename from external_tests/google_test/gtest/test/gtest-typed-test2_test.cc
rename to gtests/google_test/gtest/test/gtest-typed-test2_test.cc

rename from external_tests/google_test/gtest/test/gtest-typed-test_test.cc
rename to gtests/google_test/gtest/test/gtest-typed-test_test.cc

rename from external_tests/google_test/gtest/test/gtest-typed-test_test.h
rename to gtests/google_test/gtest/test/gtest-typed-test_test.h

rename from external_tests/google_test/gtest/test/gtest-unittest-api_test.cc
rename to gtests/google_test/gtest/test/gtest-unittest-api_test.cc

rename from external_tests/google_test/gtest/test/gtest_all_test.cc
rename to gtests/google_test/gtest/test/gtest_all_test.cc

rename from external_tests/google_test/gtest/test/gtest_break_on_failure_unittest.py
rename to gtests/google_test/gtest/test/gtest_break_on_failure_unittest.py

rename from external_tests/google_test/gtest/test/gtest_break_on_failure_unittest_.cc
rename to gtests/google_test/gtest/test/gtest_break_on_failure_unittest_.cc

rename from external_tests/google_test/gtest/test/gtest_catch_exceptions_test.py
rename to gtests/google_test/gtest/test/gtest_catch_exceptions_test.py

rename from external_tests/google_test/gtest/test/gtest_catch_exceptions_test_.cc
rename to gtests/google_test/gtest/test/gtest_catch_exceptions_test_.cc

rename from external_tests/google_test/gtest/test/gtest_color_test.py
rename to gtests/google_test/gtest/test/gtest_color_test.py

rename from external_tests/google_test/gtest/test/gtest_color_test_.cc
rename to gtests/google_test/gtest/test/gtest_color_test_.cc

rename from external_tests/google_test/gtest/test/gtest_env_var_test.py
rename to gtests/google_test/gtest/test/gtest_env_var_test.py

rename from external_tests/google_test/gtest/test/gtest_env_var_test_.cc
rename to gtests/google_test/gtest/test/gtest_env_var_test_.cc

rename from external_tests/google_test/gtest/test/gtest_environment_test.cc
rename to gtests/google_test/gtest/test/gtest_environment_test.cc

rename from external_tests/google_test/gtest/test/gtest_filter_unittest.py
rename to gtests/google_test/gtest/test/gtest_filter_unittest.py

rename from external_tests/google_test/gtest/test/gtest_filter_unittest_.cc
rename to gtests/google_test/gtest/test/gtest_filter_unittest_.cc

rename from external_tests/google_test/gtest/test/gtest_help_test.py
rename to gtests/google_test/gtest/test/gtest_help_test.py

rename from external_tests/google_test/gtest/test/gtest_help_test_.cc
rename to gtests/google_test/gtest/test/gtest_help_test_.cc

rename from external_tests/google_test/gtest/test/gtest_list_tests_unittest.py
rename to gtests/google_test/gtest/test/gtest_list_tests_unittest.py

rename from external_tests/google_test/gtest/test/gtest_list_tests_unittest_.cc
rename to gtests/google_test/gtest/test/gtest_list_tests_unittest_.cc

rename from external_tests/google_test/gtest/test/gtest_main_unittest.cc
rename to gtests/google_test/gtest/test/gtest_main_unittest.cc

rename from external_tests/google_test/gtest/test/gtest_no_test_unittest.cc
rename to gtests/google_test/gtest/test/gtest_no_test_unittest.cc

rename from external_tests/google_test/gtest/test/gtest_output_test.py
rename to gtests/google_test/gtest/test/gtest_output_test.py

rename from external_tests/google_test/gtest/test/gtest_output_test_.cc
rename to gtests/google_test/gtest/test/gtest_output_test_.cc

rename from external_tests/google_test/gtest/test/gtest_output_test_golden_lin.txt
rename to gtests/google_test/gtest/test/gtest_output_test_golden_lin.txt

rename from external_tests/google_test/gtest/test/gtest_pred_impl_unittest.cc
rename to gtests/google_test/gtest/test/gtest_pred_impl_unittest.cc

rename from external_tests/google_test/gtest/test/gtest_premature_exit_test.cc
rename to gtests/google_test/gtest/test/gtest_premature_exit_test.cc

rename from external_tests/google_test/gtest/test/gtest_prod_test.cc
rename to gtests/google_test/gtest/test/gtest_prod_test.cc

rename from external_tests/google_test/gtest/test/gtest_repeat_test.cc
rename to gtests/google_test/gtest/test/gtest_repeat_test.cc

rename from external_tests/google_test/gtest/test/gtest_shuffle_test.py
rename to gtests/google_test/gtest/test/gtest_shuffle_test.py

rename from external_tests/google_test/gtest/test/gtest_shuffle_test_.cc
rename to gtests/google_test/gtest/test/gtest_shuffle_test_.cc

rename from external_tests/google_test/gtest/test/gtest_sole_header_test.cc
rename to gtests/google_test/gtest/test/gtest_sole_header_test.cc

rename from external_tests/google_test/gtest/test/gtest_stress_test.cc
rename to gtests/google_test/gtest/test/gtest_stress_test.cc

rename from external_tests/google_test/gtest/test/gtest_test_utils.py
rename to gtests/google_test/gtest/test/gtest_test_utils.py

rename from external_tests/google_test/gtest/test/gtest_throw_on_failure_ex_test.cc
rename to gtests/google_test/gtest/test/gtest_throw_on_failure_ex_test.cc

rename from external_tests/google_test/gtest/test/gtest_throw_on_failure_test.py
rename to gtests/google_test/gtest/test/gtest_throw_on_failure_test.py

rename from external_tests/google_test/gtest/test/gtest_throw_on_failure_test_.cc
rename to gtests/google_test/gtest/test/gtest_throw_on_failure_test_.cc

rename from external_tests/google_test/gtest/test/gtest_uninitialized_test.py
rename to gtests/google_test/gtest/test/gtest_uninitialized_test.py

rename from external_tests/google_test/gtest/test/gtest_uninitialized_test_.cc
rename to gtests/google_test/gtest/test/gtest_uninitialized_test_.cc

rename from external_tests/google_test/gtest/test/gtest_unittest.cc
rename to gtests/google_test/gtest/test/gtest_unittest.cc

rename from external_tests/google_test/gtest/test/gtest_xml_outfile1_test_.cc
rename to gtests/google_test/gtest/test/gtest_xml_outfile1_test_.cc

rename from external_tests/google_test/gtest/test/gtest_xml_outfile2_test_.cc
rename to gtests/google_test/gtest/test/gtest_xml_outfile2_test_.cc

rename from external_tests/google_test/gtest/test/gtest_xml_outfiles_test.py
rename to gtests/google_test/gtest/test/gtest_xml_outfiles_test.py

rename from external_tests/google_test/gtest/test/gtest_xml_output_unittest.py
rename to gtests/google_test/gtest/test/gtest_xml_output_unittest.py

rename from external_tests/google_test/gtest/test/gtest_xml_output_unittest_.cc
rename to gtests/google_test/gtest/test/gtest_xml_output_unittest_.cc

rename from external_tests/google_test/gtest/test/gtest_xml_test_utils.py
rename to gtests/google_test/gtest/test/gtest_xml_test_utils.py

rename from external_tests/google_test/gtest/test/production.cc
rename to gtests/google_test/gtest/test/production.cc

rename from external_tests/google_test/gtest/test/production.h
rename to gtests/google_test/gtest/test/production.h

rename from external_tests/google_test/gtest/xcode/Config/DebugProject.xcconfig
rename to gtests/google_test/gtest/xcode/Config/DebugProject.xcconfig

rename from external_tests/google_test/gtest/xcode/Config/FrameworkTarget.xcconfig
rename to gtests/google_test/gtest/xcode/Config/FrameworkTarget.xcconfig

rename from external_tests/google_test/gtest/xcode/Config/General.xcconfig
rename to gtests/google_test/gtest/xcode/Config/General.xcconfig

rename from external_tests/google_test/gtest/xcode/Config/ReleaseProject.xcconfig
rename to gtests/google_test/gtest/xcode/Config/ReleaseProject.xcconfig

rename from external_tests/google_test/gtest/xcode/Config/StaticLibraryTarget.xcconfig
rename to gtests/google_test/gtest/xcode/Config/StaticLibraryTarget.xcconfig

rename from external_tests/google_test/gtest/xcode/Config/TestTarget.xcconfig
rename to gtests/google_test/gtest/xcode/Config/TestTarget.xcconfig

rename from external_tests/google_test/gtest/xcode/Resources/Info.plist
rename to gtests/google_test/gtest/xcode/Resources/Info.plist

rename from external_tests/google_test/gtest/xcode/Samples/FrameworkSample/Info.plist
rename to gtests/google_test/gtest/xcode/Samples/FrameworkSample/Info.plist

rename from external_tests/google_test/gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
rename to gtests/google_test/gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj

rename from external_tests/google_test/gtest/xcode/Samples/FrameworkSample/runtests.sh
rename to gtests/google_test/gtest/xcode/Samples/FrameworkSample/runtests.sh

rename from external_tests/google_test/gtest/xcode/Samples/FrameworkSample/widget.cc
rename to gtests/google_test/gtest/xcode/Samples/FrameworkSample/widget.cc

rename from external_tests/google_test/gtest/xcode/Samples/FrameworkSample/widget.h
rename to gtests/google_test/gtest/xcode/Samples/FrameworkSample/widget.h

rename from external_tests/google_test/gtest/xcode/Samples/FrameworkSample/widget_test.cc
rename to gtests/google_test/gtest/xcode/Samples/FrameworkSample/widget_test.cc

rename from external_tests/google_test/gtest/xcode/Scripts/runtests.sh
rename to gtests/google_test/gtest/xcode/Scripts/runtests.sh

rename from external_tests/google_test/gtest/xcode/Scripts/versiongenerate.py
rename to gtests/google_test/gtest/xcode/Scripts/versiongenerate.py

rename from external_tests/google_test/gtest/xcode/gtest.xcodeproj/project.pbxproj
rename to gtests/google_test/gtest/xcode/gtest.xcodeproj/project.pbxproj

rename from external_tests/google_test/manifest.mn
rename to gtests/google_test/manifest.mn

rename from external_tests/manifest.mn
rename to gtests/manifest.mn

rename from external_tests/nss_bogo_shim/Makefile
rename to gtests/nss_bogo_shim/Makefile

rename from external_tests/nss_bogo_shim/config.cc
rename to gtests/nss_bogo_shim/config.cc

rename from external_tests/nss_bogo_shim/config.h
rename to gtests/nss_bogo_shim/config.h

rename from external_tests/nss_bogo_shim/config.json
rename to gtests/nss_bogo_shim/config.json

rename from external_tests/nss_bogo_shim/manifest.mn
rename to gtests/nss_bogo_shim/manifest.mn

rename from external_tests/nss_bogo_shim/nss_bogo_shim.cc
rename to gtests/nss_bogo_shim/nss_bogo_shim.cc

rename from external_tests/nss_bogo_shim/nss_bogo_shim.gyp
rename to gtests/nss_bogo_shim/nss_bogo_shim.gyp
--- a/external_tests/nss_bogo_shim/nss_bogo_shim.gyp
+++ b/gtests/nss_bogo_shim/nss_bogo_shim.gyp
@@ -13,17 +13,17 @@
         'config.cc',
         'nss_bogo_shim.cc',
         'nsskeys.cc'
       ],
       'dependencies': [
         '<(DEPTH)/exports.gyp:nss_exports',
         '<(DEPTH)/lib/util/util.gyp:nssutil3',
         '<(DEPTH)/lib/sqlite/sqlite.gyp:sqlite3',
-        '<(DEPTH)/external_tests/google_test/google_test.gyp:gtest',
+        '<(DEPTH)/gtests/google_test/google_test.gyp:gtest',
         '<(DEPTH)/lib/softoken/softoken.gyp:softokn',
         '<(DEPTH)/lib/smime/smime.gyp:smime',
         '<(DEPTH)/lib/ssl/ssl.gyp:ssl',
         '<(DEPTH)/lib/nss/nss.gyp:nss_static',
         '<(DEPTH)/cmd/lib/lib.gyp:sectool',
         '<(DEPTH)/lib/pkcs12/pkcs12.gyp:pkcs12',
         '<(DEPTH)/lib/pkcs7/pkcs7.gyp:pkcs7',
         '<(DEPTH)/lib/certhigh/certhigh.gyp:certhi',

rename from external_tests/nss_bogo_shim/nsskeys.cc
rename to gtests/nss_bogo_shim/nsskeys.cc

rename from external_tests/nss_bogo_shim/nsskeys.h
rename to gtests/nss_bogo_shim/nsskeys.h

rename from external_tests/pk11_gtest/Makefile
rename to gtests/pk11_gtest/Makefile

rename from external_tests/pk11_gtest/manifest.mn
rename to gtests/pk11_gtest/manifest.mn
--- a/external_tests/pk11_gtest/manifest.mn
+++ b/gtests/pk11_gtest/manifest.mn
@@ -11,18 +11,18 @@ CPPSRCS = \
       pk11_chacha20poly1305_unittest.cc \
       pk11_export_unittest.cc \
       pk11_pbkdf2_unittest.cc \
       pk11_prf_unittest.cc \
       pk11_prng_unittest.cc \
       pk11_rsapss_unittest.cc \
       $(NULL)
 
-INCLUDES += -I$(CORE_DEPTH)/external_tests/google_test/gtest/include \
-            -I$(CORE_DEPTH)/external_tests/common
+INCLUDES += -I$(CORE_DEPTH)/gtests/google_test/gtest/include \
+            -I$(CORE_DEPTH)/gtests/common
 
 REQUIRES = nspr nss libdbm gtest
 
 PROGRAM = pk11_gtest
 
 EXTRA_LIBS = $(DIST)/lib/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) $(EXTRA_OBJS) \
              ../common/$(OBJDIR)/gtests$(OBJ_SUFFIX)
 

rename from external_tests/pk11_gtest/pk11_aeskeywrap_unittest.cc
rename to gtests/pk11_gtest/pk11_aeskeywrap_unittest.cc

rename from external_tests/pk11_gtest/pk11_chacha20poly1305_unittest.cc
rename to gtests/pk11_gtest/pk11_chacha20poly1305_unittest.cc

rename from external_tests/pk11_gtest/pk11_export_unittest.cc
rename to gtests/pk11_gtest/pk11_export_unittest.cc

rename from external_tests/pk11_gtest/pk11_gtest.gyp
rename to gtests/pk11_gtest/pk11_gtest.gyp
--- a/external_tests/pk11_gtest/pk11_gtest.gyp
+++ b/gtests/pk11_gtest/pk11_gtest.gyp
@@ -12,27 +12,27 @@
       'type': 'executable',
       'sources': [
         'pk11_aeskeywrap_unittest.cc',
         'pk11_chacha20poly1305_unittest.cc',
         'pk11_pbkdf2_unittest.cc',
         'pk11_prf_unittest.cc',
         'pk11_prng_unittest.cc',
         'pk11_rsapss_unittest.cc',
-        '<(DEPTH)/external_tests/common/gtests.cc'
+        '<(DEPTH)/gtests/common/gtests.cc'
       ],
       'dependencies': [
         '<(DEPTH)/exports.gyp:nss_exports',
         '<(DEPTH)/lib/freebl/freebl.gyp:<(freebl_name)',
-        '<(DEPTH)/external_tests/google_test/google_test.gyp:gtest',
+        '<(DEPTH)/gtests/google_test/google_test.gyp:gtest',
       ],
     }
   ],
   'target_defaults': {
     'include_dirs': [
-      '../../external_tests/google_test/gtest/include',
-      '../../external_tests/common'
+      '../../gtests/google_test/gtest/include',
+      '../../gtests/common'
     ]
   },
   'variables': {
     'module': 'nss'
   }
 }

rename from external_tests/pk11_gtest/pk11_pbkdf2_unittest.cc
rename to gtests/pk11_gtest/pk11_pbkdf2_unittest.cc

rename from external_tests/pk11_gtest/pk11_prf_unittest.cc
rename to gtests/pk11_gtest/pk11_prf_unittest.cc

rename from external_tests/pk11_gtest/pk11_prng_unittest.cc
rename to gtests/pk11_gtest/pk11_prng_unittest.cc

rename from external_tests/pk11_gtest/pk11_rsapss_unittest.cc
rename to gtests/pk11_gtest/pk11_rsapss_unittest.cc

rename from external_tests/ssl_gtest/Makefile
rename to gtests/ssl_gtest/Makefile

rename from external_tests/ssl_gtest/databuffer.h
rename to gtests/ssl_gtest/databuffer.h

rename from external_tests/ssl_gtest/gtest_utils.h
rename to gtests/ssl_gtest/gtest_utils.h

rename from external_tests/ssl_gtest/libssl_internals.c
rename to gtests/ssl_gtest/libssl_internals.c

rename from external_tests/ssl_gtest/libssl_internals.h
rename to gtests/ssl_gtest/libssl_internals.h

rename from external_tests/ssl_gtest/manifest.mn
rename to gtests/ssl_gtest/manifest.mn
--- a/external_tests/ssl_gtest/manifest.mn
+++ b/gtests/ssl_gtest/manifest.mn
@@ -35,18 +35,18 @@ CPPSRCS = \
       test_io.cc \
       tls_agent.cc \
       tls_connect.cc \
       tls_hkdf_unittest.cc \
       tls_filter.cc \
       tls_parser.cc \
       $(NULL)
 
-INCLUDES += -I$(CORE_DEPTH)/external_tests/google_test/gtest/include \
-            -I$(CORE_DEPTH)/external_tests/common
+INCLUDES += -I$(CORE_DEPTH)/gtests/google_test/gtest/include \
+            -I$(CORE_DEPTH)/gtests/common
 
 REQUIRES = nspr nss libdbm gtest
 
 PROGRAM = ssl_gtest
 EXTRA_LIBS = $(DIST)/lib/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) \
              $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX)
 
 USE_STATIC_LIBS = 1

rename from external_tests/ssl_gtest/ssl_0rtt_unittest.cc
rename to gtests/ssl_gtest/ssl_0rtt_unittest.cc

rename from external_tests/ssl_gtest/ssl_agent_unittest.cc
rename to gtests/ssl_gtest/ssl_agent_unittest.cc

rename from external_tests/ssl_gtest/ssl_auth_unittest.cc
rename to gtests/ssl_gtest/ssl_auth_unittest.cc

rename from external_tests/ssl_gtest/ssl_cert_ext_unittest.cc
rename to gtests/ssl_gtest/ssl_cert_ext_unittest.cc

rename from external_tests/ssl_gtest/ssl_ciphersuite_unittest.cc
rename to gtests/ssl_gtest/ssl_ciphersuite_unittest.cc

rename from external_tests/ssl_gtest/ssl_damage_unittest.cc
rename to gtests/ssl_gtest/ssl_damage_unittest.cc

rename from external_tests/ssl_gtest/ssl_dhe_unittest.cc
rename to gtests/ssl_gtest/ssl_dhe_unittest.cc

rename from external_tests/ssl_gtest/ssl_drop_unittest.cc
rename to gtests/ssl_gtest/ssl_drop_unittest.cc

rename from external_tests/ssl_gtest/ssl_ecdh_unittest.cc
rename to gtests/ssl_gtest/ssl_ecdh_unittest.cc

rename from external_tests/ssl_gtest/ssl_ems_unittest.cc
rename to gtests/ssl_gtest/ssl_ems_unittest.cc

rename from external_tests/ssl_gtest/ssl_extension_unittest.cc
rename to gtests/ssl_gtest/ssl_extension_unittest.cc

rename from external_tests/ssl_gtest/ssl_gtest.cc
rename to gtests/ssl_gtest/ssl_gtest.cc

rename from external_tests/ssl_gtest/ssl_gtest.gyp
rename to gtests/ssl_gtest/ssl_gtest.gyp
--- a/external_tests/ssl_gtest/ssl_gtest.gyp
+++ b/gtests/ssl_gtest/ssl_gtest.gyp
@@ -38,17 +38,17 @@
         'tls_filter.cc',
         'tls_hkdf_unittest.cc',
         'tls_parser.cc'
       ],
       'dependencies': [
         '<(DEPTH)/exports.gyp:nss_exports',
         '<(DEPTH)/lib/util/util.gyp:nssutil3',
         '<(DEPTH)/lib/sqlite/sqlite.gyp:sqlite3',
-        '<(DEPTH)/external_tests/google_test/google_test.gyp:gtest',
+        '<(DEPTH)/gtests/google_test/google_test.gyp:gtest',
         '<(DEPTH)/lib/softoken/softoken.gyp:softokn',
         '<(DEPTH)/lib/smime/smime.gyp:smime',
         '<(DEPTH)/lib/ssl/ssl.gyp:ssl',
         '<(DEPTH)/lib/nss/nss.gyp:nss_static',
         '<(DEPTH)/cmd/lib/lib.gyp:sectool',
         '<(DEPTH)/lib/pkcs12/pkcs12.gyp:pkcs12',
         '<(DEPTH)/lib/pkcs7/pkcs7.gyp:pkcs7',
         '<(DEPTH)/lib/certhigh/certhigh.gyp:certhi',
@@ -86,18 +86,18 @@
             '<(DEPTH)/lib/libpkix/pkix_pl_nss/pki/pki.gyp:pkixpki',
           ],
         }],
       ],
     }
   ],
   'target_defaults': {
     'include_dirs': [
-      '../../external_tests/google_test/gtest/include',
-      '../../external_tests/common',
+      '../../gtests/google_test/gtest/include',
+      '../../gtests/common',
       '../../lib/ssl'
     ],
     'defines': [
       'NSS_USE_STATIC_LIBS'
     ]
   },
   'variables': {
     'module': 'nss',

rename from external_tests/ssl_gtest/ssl_hrr_unittest.cc
rename to gtests/ssl_gtest/ssl_hrr_unittest.cc

rename from external_tests/ssl_gtest/ssl_loopback_unittest.cc
rename to gtests/ssl_gtest/ssl_loopback_unittest.cc

rename from external_tests/ssl_gtest/ssl_record_unittest.cc
rename to gtests/ssl_gtest/ssl_record_unittest.cc

rename from external_tests/ssl_gtest/ssl_resumption_unittest.cc
rename to gtests/ssl_gtest/ssl_resumption_unittest.cc

rename from external_tests/ssl_gtest/ssl_skip_unittest.cc
rename to gtests/ssl_gtest/ssl_skip_unittest.cc

rename from external_tests/ssl_gtest/ssl_staticrsa_unittest.cc
rename to gtests/ssl_gtest/ssl_staticrsa_unittest.cc

rename from external_tests/ssl_gtest/ssl_v2_client_hello_unittest.cc
rename to gtests/ssl_gtest/ssl_v2_client_hello_unittest.cc

rename from external_tests/ssl_gtest/ssl_version_unittest.cc
rename to gtests/ssl_gtest/ssl_version_unittest.cc

rename from external_tests/ssl_gtest/test_io.cc
rename to gtests/ssl_gtest/test_io.cc

rename from external_tests/ssl_gtest/test_io.h
rename to gtests/ssl_gtest/test_io.h

rename from external_tests/ssl_gtest/tls_agent.cc
rename to gtests/ssl_gtest/tls_agent.cc

rename from external_tests/ssl_gtest/tls_agent.h
rename to gtests/ssl_gtest/tls_agent.h

rename from external_tests/ssl_gtest/tls_connect.cc
rename to gtests/ssl_gtest/tls_connect.cc

rename from external_tests/ssl_gtest/tls_connect.h
rename to gtests/ssl_gtest/tls_connect.h

rename from external_tests/ssl_gtest/tls_filter.cc
rename to gtests/ssl_gtest/tls_filter.cc

rename from external_tests/ssl_gtest/tls_filter.h
rename to gtests/ssl_gtest/tls_filter.h

rename from external_tests/ssl_gtest/tls_hkdf_unittest.cc
rename to gtests/ssl_gtest/tls_hkdf_unittest.cc

rename from external_tests/ssl_gtest/tls_parser.cc
rename to gtests/ssl_gtest/tls_parser.cc

rename from external_tests/ssl_gtest/tls_parser.h
rename to gtests/ssl_gtest/tls_parser.h

rename from external_tests/util_gtest/Makefile
rename to gtests/util_gtest/Makefile

rename from external_tests/util_gtest/manifest.mn
rename to gtests/util_gtest/manifest.mn
--- a/external_tests/util_gtest/manifest.mn
+++ b/gtests/util_gtest/manifest.mn
@@ -6,18 +6,18 @@ CORE_DEPTH = ../..
 DEPTH      = ../..
 MODULE = nss
 
 CPPSRCS = \
 	util_utf8_unittest.cc \
 	$(NULL)
 
 INCLUDES += \
-	-I$(CORE_DEPTH)/external_tests/google_test/gtest/include \
-	-I$(CORE_DEPTH)/external_tests/common \
+	-I$(CORE_DEPTH)/gtests/google_test/gtest/include \
+	-I$(CORE_DEPTH)/gtests/common \
 	$(NULL)
 
 REQUIRES = nspr gtest
 
 PROGRAM = util_gtest
 
 EXTRA_LIBS = \
 	$(DIST)/lib/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) \

rename from external_tests/util_gtest/util_gtest.gyp
rename to gtests/util_gtest/util_gtest.gyp
--- a/external_tests/util_gtest/util_gtest.gyp
+++ b/gtests/util_gtest/util_gtest.gyp
@@ -7,28 +7,28 @@
     '../common/gtest.gypi',
   ],
   'targets': [
     {
       'target_name': 'util_gtest',
       'type': 'executable',
       'sources': [
         'util_utf8_unittest.cc',
-        '<(DEPTH)/external_tests/common/gtests.cc'
+        '<(DEPTH)/gtests/common/gtests.cc'
       ],
       'dependencies': [
         '<(DEPTH)/exports.gyp:nss_exports',
-        '<(DEPTH)/external_tests/google_test/google_test.gyp:gtest',
+        '<(DEPTH)/gtests/google_test/google_test.gyp:gtest',
         '<(DEPTH)/lib/util/util.gyp:nssutil',
       ]
     }
   ],
   'target_defaults': {
     'include_dirs': [
-      '../../external_tests/google_test/gtest/include',
-      '../../external_tests/common',
+      '../../gtests/google_test/gtest/include',
+      '../../gtests/common',
       '../../lib/util'
     ]
   },
   'variables': {
     'module': 'nss'
   }
 }

rename from external_tests/util_gtest/util_utf8_unittest.cc
rename to gtests/util_gtest/util_utf8_unittest.cc

--- a/manifest.mn
+++ b/manifest.mn
@@ -5,13 +5,13 @@
 CORE_DEPTH = .
 DEPTH      = .
 
 IMPORTS =	nspr20/v4.8 \
 		$(NULL)
 
 RELEASE = nss
 
-DIRS = coreconf lib cmd external_tests
+DIRS = coreconf lib cmd gtests
 
 ifdef FUZZ
 DIRS += fuzz
 endif

--- a/nss.gyp
+++ b/nss.gyp
@@ -202,23 +202,23 @@
             'cmd/tests/tests.gyp:dertimetest',
             'cmd/tests/tests.gyp:encodeinttest',
             'cmd/tests/tests.gyp:nonspr10',
             'cmd/tests/tests.gyp:remtest',
             'cmd/tests/tests.gyp:secmodtest',
             'cmd/tstclnt/tstclnt.gyp:tstclnt',
             'cmd/vfychain/vfychain.gyp:vfychain',
             'cmd/vfyserv/vfyserv.gyp:vfyserv',
-            'external_tests/google_test/google_test.gyp:gtest1',
-            'external_tests/common/common.gyp:gtests',
-            'external_tests/der_gtest/der_gtest.gyp:der_gtest',
-            'external_tests/pk11_gtest/pk11_gtest.gyp:pk11_gtest',
-            'external_tests/ssl_gtest/ssl_gtest.gyp:ssl_gtest',
-            'external_tests/util_gtest/util_gtest.gyp:util_gtest',
-            'external_tests/nss_bogo_shim/nss_bogo_shim.gyp:nss_bogo_shim'
+            'gtests/google_test/google_test.gyp:gtest1',
+            'gtests/common/common.gyp:gtests',
+            'gtests/der_gtest/der_gtest.gyp:der_gtest',
+            'gtests/pk11_gtest/pk11_gtest.gyp:pk11_gtest',
+            'gtests/ssl_gtest/ssl_gtest.gyp:ssl_gtest',
+            'gtests/util_gtest/util_gtest.gyp:util_gtest',
+            'gtests/nss_bogo_shim/nss_bogo_shim.gyp:nss_bogo_shim'
           ],
           'conditions': [
             [ 'OS=="linux"', {
               'dependencies': [
                 'cmd/lowhashtest/lowhashtest.gyp:lowhashtest',
               ],
             }],
             [ 'disable_libpkix==0', {

--- a/tests/bogo/bogo.sh
+++ b/tests/bogo/bogo.sh
@@ -43,14 +43,14 @@ bogo_cleanup()
 export PATH=$PATH:/usr/lib/go-1.6/bin
 
 cd "$(dirname "$0")"
 SOURCE_DIR="$PWD"/../..
 bogo_init
 (cd "$BORING"/ssl/test/runner;
  GOPATH="$PWD" go test -pipe -shim-path "${BINDIR}"/nss_bogo_shim \
 	 -loose-errors -allow-unimplemented \
-	 -shim-config "${SOURCE_DIR}/external_tests/nss_bogo_shim/config.json") \
+	 -shim-config "${SOURCE_DIR}/gtests/nss_bogo_shim/config.json") \
 	 2>bogo.errors | tee bogo.log
 html_msg "${PIPESTATUS[0]}" 0 "Bogo" "Run successfully"
 grep -i 'FAILED\|Assertion failure' bogo.errors
 html_msg $? 1 "Bogo" "No failures"
 bogo_cleanup