diff --git a/CMakeLists.txt b/CMakeLists.txt
index e000228af..325fe4d1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -851,7 +851,7 @@ ENDIF()
 # Option to Enable DAP long tests, remote tests.
 OPTION(ENABLE_DAP_LONG_TESTS "Enable DAP long tests." OFF)
 OPTION(ENABLE_DAP_REMOTE_TESTS "Enable DAP remote tests." ON)
-SET(REMOTETESTSERVERS "149.165.169.123:8080,remotetest.unidata.ucar.edu" CACHE STRING "test servers to use for remote test")
+SET(REMOTETESTSERVERS "remotetest.unidata.ucar.edu" CACHE STRING "test servers to use for remote test")
 
 # Enable some developer-only tests
 OPTION(ENABLE_EXTRA_TESTS "Enable Extra tests. Some may not work because of known issues. Developers only." OFF)
diff --git a/configure.ac b/configure.ac
index 7df6343ae..5618b49b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -399,7 +399,7 @@ AC_ARG_WITH([testservers],
             [REMOTETESTSERVERS=$with_testservers], [REMOTETESTSERVERS=no])
 msg="$REMOTETESTSERVERS"
 if test "x$REMOTETESTSERVERS" = xno ; then
-  svclist="149.165.169.123:8080,remotetest.unidata.ucar.edu"
+  svclist="remotetest.unidata.ucar.edu"
   REMOTETESTSERVERS="$svclist"
 fi
 AC_MSG_RESULT([$svclist])
diff --git a/debug/cf b/debug/cf
index f48041acc..962e56b22 100644
--- a/debug/cf
+++ b/debug/cf
@@ -16,7 +16,7 @@ FAST=1
 #PNETCDF=1
 #PAR4=1
 
-#TESTSERVERS="localhost:8080,149.165.169.123:8080"
+#TESTSERVERS="localhost:8080,remotetest.unidata.ucar.edu"
 
 if test $# != 0 ; then
 cmds=$@
diff --git a/debug/cf.cmake b/debug/cf.cmake
index b66b4d534..7a92e0dc0 100644
--- a/debug/cf.cmake
+++ b/debug/cf.cmake
@@ -30,7 +30,7 @@ if test "x$VS" = x1 ; then
   fi
 fi
 
-#TESTSERVERS="localhost:8080,149.165.169.123:8080"
+#TESTSERVERS="localhost:8080,remotetest.unidata.ucar.edu"
 
 #export NCPATHDEBUG=1
 
diff --git a/docs/DAP4.md b/docs/DAP4.md
index 165c4757e..79e6548ab 100644
--- a/docs/DAP4.md
+++ b/docs/DAP4.md
@@ -50,13 +50,13 @@ command to see the netCDF Classic translation.
 For example, if a web browser is given the following, this URL
 will return the DMR in XML format for the specified dataset.
 ````
-http://149.165.169.123:8080/d4ts/testfiles/test_one_var.nc.dmr.xml
+https://remotetest.unidata.ucar.edu/d4ts/testfiles/test_one_var.nc.dmr.xml
 ````
 
 Then by using the following ncdump command, it is possible to see the
 equivalent netCDF enhanced translation.
 ````
-ncdump -h http://149.165.169.123:8080/d4ts/testfiles/test_one_var.nc#dap4
+ncdump -h https://remotetest.unidata.ucar.edu/d4ts/testfiles/test_one_var.nc#dap4
 ````
 Note the use of the "dap4" fragment added at the end. This tells the netCDF
 library to use the DAP4 protocol instead of the default DAP2 protocol.
diff --git a/docs/byterange.dox b/docs/byterange.dox
index 04f43023e..82730a50e 100644
--- a/docs/byterange.dox
+++ b/docs/byterange.dox
@@ -20,7 +20,7 @@ the remote server supports byte-range access.
 Two examples:
 
 1. An Amazon S3 object containing a netcdf classic file.
-   - location: "http://149.165.169.123:8080/thredds/fileServer/testdata/2004050300_eta_211.nc#mode=bytes" 
+   - location: "https://remotetest.unidata.ucar.edu/thredds/fileServer/testdata/2004050300_eta_211.nc#mode=bytes" 
 2. A Thredds Server dataset supporting the Thredds HTTPServer protocol.
    and containing a netcdf enhanced file.
    - location: "http://noaa-goes16.s3.amazonaws.com/ABI-L1b-RadC/2017/059/03/OR_ABI-L1b-RadC-M3C13_G16_s20170590337505_e20170590340289_c20170590340316.nc#mode=bytes"
diff --git a/docs/testserver.dox b/docs/testserver.dox
index a57395975..5c1341a1c 100755
--- a/docs/testserver.dox
+++ b/docs/testserver.dox
@@ -19,7 +19,7 @@ The way that this is tests is to establish two servlets running
 under a Tomcat server on some machine with a known IP address
 or DNS name. For example, accessing this URL.
 ````
-http://149.165.169.123:8080/dts/
+https://remotetest.unidata.ucar.edu/dts/
 ````
 will bring up a page with a variety of DAP2 accessible files.
 These files are accessed by the netcdf-c test case
@@ -30,7 +30,7 @@ Similarly, the DAP4 test case is
 _netcdf-c/ncdap_test/test_remote.sh_
 and it accesses the test server web page with this URL.
 ````
-http://149.165.169.123:8080/d4ts/
+https://remotetest.unidata.ucar.edu/d4ts/
 ````
 Setting up and Maintaining the test server involves a somewhat complex
 set of tasks. This document shows how to do those tasks.
diff --git a/nc_test/tst_byterange.c b/nc_test/tst_byterange.c
index 34d5f79ae..2c19a29fb 100644
--- a/nc_test/tst_byterange.c
+++ b/nc_test/tst_byterange.c
@@ -33,7 +33,7 @@ struct TESTURLS {
     int format; /* instance of NC_FORMATX_XXX */
     const char* url;
 } testurls[] = {
-{NC_FORMAT_CLASSIC,"http://149.165.169.123:8080/thredds/fileServer/testdata/2004050300_eta_211.nc#bytes"},
+{NC_FORMAT_CLASSIC,"https://remotetest.unidata.ucar.edu/thredds/fileServer/testdata/2004050300_eta_211.nc#bytes"},
 #ifdef USE_NETCDF4
 {NC_FORMAT_NETCDF4,"http://noaa-goes16.s3.amazonaws.com/ABI-L1b-RadC/2017/059/03/OR_ABI-L1b-RadC-M3C13_G16_s20170590337505_e20170590340289_c20170590340316.nc#mode=bytes"},
 #endif