diff --git a/cf b/cf
index 5c4a2ccd1..4d4d55d26 100644
--- a/cf
+++ b/cf
@@ -8,7 +8,7 @@ fi
 
 HDF5=1
 DAP=1
-PNETCDF=1
+#PNETCDF=1
 #HDF4=1
 #RPC=1
 #PGI=1
diff --git a/libdap2/Make0 b/libdap2/Make0
index 0b341f758..45507c451 100755
--- a/libdap2/Make0
+++ b/libdap2/Make0
@@ -258,7 +258,7 @@ fix::
 	done
 
 ##################################################
-T=civ2
+T=test_vara
 
 v::
 	cc -g -c ${T}.c ${INCL}
diff --git a/libdap2/test_vara.c b/libdap2/test_vara.c
index bd34940ac..90ed90e50 100644
--- a/libdap2/test_vara.c
+++ b/libdap2/test_vara.c
@@ -79,14 +79,15 @@ main()
     size_t start[RANK];
     size_t count[RANK];
     char URL[4096];
-    const char* svc = NULL:
+    const char* svc = NULL;
     
-    /* Find Test Server *.
+    /* Find Test Server */
     svc = NC_findtestserver("dts");
     if(svc == NULL) {
 	fprintf(stderr,"Cannot locate test server\n");
 	exit(1);
     }
+    printf("Using test server: %s\n",svc);
     strcpy(URL,svc);
     strcat(URL,DTSTEST);
 
diff --git a/libdispatch/ddispatch.c b/libdispatch/ddispatch.c
index e2a5b9891..c2e36dbf8 100644
--- a/libdispatch/ddispatch.c
+++ b/libdispatch/ddispatch.c
@@ -31,8 +31,9 @@ static struct NCPROTOCOLLIST {
    against future changes.
 */
 static const char* servers[] = {
-"http://motherlode.ucar.edu:8081", /* try this first */
-"http://thredds.ucar.edu", /* Eventually, this will work */
+"http://thredds-test.ucar.edu",
+"http://thredds.ucar.edu",
+"http://motherlode.ucar.edu:8081",
 "http://motherlode.ucar.edu:8080",
 "http://motherlode.ucar.edu",
 "http://remotetest.unidata.ucar.edu",
diff --git a/libdispatch/defcheck.c b/libdispatch/defcheck.c
index 9108bd279..5facde137 100644
--- a/libdispatch/defcheck.c
+++ b/libdispatch/defcheck.c
@@ -4,7 +4,7 @@
 #include <string.h>
 #include <netcdf.h>
 
-#define URL "http://motherlode.ucar.edu:8081/dts/test.02"
+#define URL "http://thredds-test.ucar.edu/dts/test.02"
 #define VAR "i32"
 
 #define ERRCODE 2
diff --git a/ncdap_test/tst_remote.sh b/ncdap_test/tst_remote.sh
index 0956752f4..cd2dc3a01 100755
--- a/ncdap_test/tst_remote.sh
+++ b/ncdap_test/tst_remote.sh
@@ -124,7 +124,7 @@ argo_all.cdp;1;&location.LATITUDE<1&location.LATITUDE>-1\
 # Test string access 
 # this test cannot be used because the
 # dataset has a limited lifetime
-#REMOTEURLC4="http://thredds.ucar.edu/thredds/dodsC/station/metar"
+#REMOTEURLC4="http://thredds-test.ucar.edu/thredds/dodsC/station/metar"
 #REMOTETESTSC4="\
 #Surface_METAR_20120101_0000.nc;1;weather[0:10]"