diff --git a/library_helpers/process_manager.py b/library_helpers/process_manager.py
index 10cd076..ac53b0f 100644
--- a/library_helpers/process_manager.py
+++ b/library_helpers/process_manager.py
@@ -110,6 +110,3 @@
     def killNfd(self):
         self.killProcess("nfd")
         time.sleep(2)
-
-    def startNrd(self):
-        self.startProcess("nrd", ["nrd"], "-> Starting NRD")
diff --git a/test_broadcast/broadcast-test.sh b/test_broadcast/broadcast-test.sh
index 8d29fd3..ebb1292 100755
--- a/test_broadcast/broadcast-test.sh
+++ b/test_broadcast/broadcast-test.sh
@@ -15,22 +15,14 @@
 echo "starting nfd on all hosts..."
 ssh $CTRL_B "mkdir -p $workdir/logs;\
     sudo nfd &> $workdir/logs/nfd.log &\
-    sleep 3;\
-    nrd &> $workdir/logs/nrd.log &\
     sleep 3"
 ssh $CTRL_C "mkdir -p $workdir/logs;\
     sudo nfd &> $workdir/logs/nfd.log &\
-    sleep 3;\
-    nrd &> $workdir/logs/nrd.log &\
     sleep 3"
 ssh $CTRL_D "mkdir -p $workdir/logs;\
     sudo nfd &> $workdir/logs/nfd.log &\
-    sleep 3;\
-    nrd &> $workdir/logs/nrd.log &\
     sleep 3"
 sudo nfd &> $workdir/logs/nfd.log &
-sleep 3
-nrd &> $workdir/logs/nrd.log &
 sleep 5
 
 # start ndn-traffic-server on B and C
diff --git a/test_cs_freshness/cs-freshness-test.sh b/test_cs_freshness/cs-freshness-test.sh
index cb22222..65a0496 100755
--- a/test_cs_freshness/cs-freshness-test.sh
+++ b/test_cs_freshness/cs-freshness-test.sh
@@ -9,8 +9,6 @@
 # Start NFD.
 sudo nfd &> logs/nfd.log &
 sleep 2
-nrd &> logs/nrd.log &
-sleep 2
 
 # Start ndn-traffic-server to serve `ndn:/test-caching`, FreshnessPeriod=2800ms
 ndn-traffic-server NDNTrafficServer.conf > logs/server.log 2>&1 &
diff --git a/test_fib_matching/test_fib_matching.py b/test_fib_matching/test_fib_matching.py
index 34ee731..0570f64 100644
--- a/test_fib_matching/test_fib_matching.py
+++ b/test_fib_matching/test_fib_matching.py
@@ -54,8 +54,6 @@
         #Start NFD
         self.startNfd()
         time.sleep(1)
-        self.startNrd()
-        time.sleep(1)
 
         #Start ndn-traffic-server to serve ndn:/ with Content "Z", FreshnessPeriod=10ms
         #Prefix registration using NFD FibMgmt
diff --git a/test_hub_discovery/hub-discovery-test.sh b/test_hub_discovery/hub-discovery-test.sh
index 861dc8a..62a0445 100755
--- a/test_hub_discovery/hub-discovery-test.sh
+++ b/test_hub_discovery/hub-discovery-test.sh
@@ -18,10 +18,6 @@
 sudo nfd &> $workdir/logs/nfd.log &
 sleep 2
 
-# start nrd on localhost
-nrd &> $workdir/logs/nrd.log &
-sleep 2
-
 ndn-autoconfig-server udp4://10.63.18.1 &
 
 # set record for _ndn._udp.autoconfig-test.named-data.net => 10.63.18.2
diff --git a/test_interest_aggregation/test_interest_aggregation.py b/test_interest_aggregation/test_interest_aggregation.py
index 490e3c3..1906bfa 100644
--- a/test_interest_aggregation/test_interest_aggregation.py
+++ b/test_interest_aggregation/test_interest_aggregation.py
@@ -69,8 +69,6 @@
         #Start NFD
         self.startNfd()
         time.sleep(1)
-        self.startNrd()
-        time.sleep(1)
 
         #Start ndn-traffic-server to serve ndn:/test-agg, with content delay set to 2000ms
         serverConfigurationFile = os.path.abspath(
diff --git a/test_interest_loop/interest-loop-test.sh b/test_interest_loop/interest-loop-test.sh
index 7d0a81f..a4bae83 100755
--- a/test_interest_loop/interest-loop-test.sh
+++ b/test_interest_loop/interest-loop-test.sh
@@ -32,17 +32,11 @@
 echo "start NFD on three nodes and set nexthop to create loop..."
 ssh $CTRL_B "mkdir -p $workdir/logs;\
     sudo nfd --config $workdir/nfd.conf &> $workdir/logs/nfd.log &\
-    sleep 2;\
-    nrd --config $workdir/nfd.conf &> $workdir/logs/nrd.log &\
     sleep 2"
 ssh $CTRL_C "mkdir -p $workdir/logs;\
     sudo nfd --config $workdir/nfd.conf &> $workdir/logs/nfd.log &\
-    sleep 2;\
-    nrd --config $workdir/nfd.conf &> $workdir/logs/nrd.log &\
     sleep 2"
 sudo nfd --config $workdir/nfd.conf &> $workdir/logs/nfd.log &
-sleep 2
-nrd --config $workdir/nfd.conf &> $workdir/logs/nrd.log &
 sleep 5
 ssh $CTRL_B "$workdir/add-nexthop.sh $c_ipaddr $strategy"
 ssh $CTRL_C "$workdir/add-nexthop.sh $a_ipaddr $strategy"
diff --git a/test_localhop/hostB.sh b/test_localhop/hostB.sh
index f513915..0244efe 100755
--- a/test_localhop/hostB.sh
+++ b/test_localhop/hostB.sh
@@ -3,7 +3,5 @@
 c_ipaddr=$2
 sudo nfd &> $workdir/logs/nfd.log &
 sleep 3
-nrd &> $workdir/logs/nrd.log &
-sleep 3
 faceid=$(nfdc create udp4://$c_ipaddr | grep -Po 'FaceId: .*?,' | sed 's/FaceId: //' | sed 's/,//')
 nfdc add-nexthop ndn:/localhop $faceid
diff --git a/test_localhop/localhop-test.sh b/test_localhop/localhop-test.sh
index 36c3b08..61374d9 100755
--- a/test_localhop/localhop-test.sh
+++ b/test_localhop/localhop-test.sh
@@ -19,8 +19,6 @@
 ssh $CTRL_C "mkdir -p $workdir/logs;\
     sudo nfd > $workdir/logs/nfd.log 2>&1 &\
     sleep 3;\
-    nrd > $workdir/logs/nrd.log 2>&1 &\
-    sleep 3;\
     ndn-traffic-server $workdir/NDNTrafficServer.conf > $workdir/logs/server.log 2>&1 &"
 
 # start nfd and add nexthop of ndn:/localhop to C on host B
@@ -32,8 +30,6 @@
 echo "starting nfd and adding nexthop of ndn:/localhop to B on host A..."
 sudo nfd > logs/nfd.log 2>&1 &
 sleep 3
-nrd > logs/nrd.log 2>&1 &
-sleep 3
 faceid=$(nfdc create udp4://$b_ipaddr | grep -Po 'FaceId: .*?,' | sed 's/FaceId: //' | sed 's/,//')
 nfdc add-nexthop ndn:/localhop $faceid
 if [[ $? -ne 0 ]]
diff --git a/test_localhost_scope/in-master.sh b/test_localhost_scope/in-master.sh
index c782aed..7babc24 100755
--- a/test_localhost_scope/in-master.sh
+++ b/test_localhost_scope/in-master.sh
@@ -14,8 +14,6 @@
 ssh $CTRL_B "mkdir -p $workdir/logs;\
     sudo nfd &> $workdir/logs/nfd.log &\
     sleep 2;\
-    nrd &> $workdir/logs/nrd.log &\
-    sleep 2;\
     ndn-traffic-server $workdir/NDNTrafficServer.conf &> $workdir/logs/server.log &"
 sleep 2
 
diff --git a/test_localhost_scope/out-master.sh b/test_localhost_scope/out-master.sh
index 742c688..9970eb8 100755
--- a/test_localhost_scope/out-master.sh
+++ b/test_localhost_scope/out-master.sh
@@ -10,8 +10,6 @@
 
 # start NFD on B
 ssh $CTRL_B "sudo nfd > $workdir/logs/nfd.log 2>&1 &\
-    sleep 2;\
-    nrd &> $workdir/logs/nrd.log &\
     sleep 2"
 
 # start netcat on A
diff --git a/test_multicast/multicast-test.sh b/test_multicast/multicast-test.sh
index 503c0bd..4c39bf3 100755
--- a/test_multicast/multicast-test.sh
+++ b/test_multicast/multicast-test.sh
@@ -19,21 +19,15 @@
 ssh $CTRL_B "mkdir -p $workdir/logs;\
     sudo nfd &> $workdir/logs/nfd.log &\
     sleep 3;\
-    nrd &> $workdir/logs/nrd.log &\
-    sleep 3;\
     ndn-traffic-server $workdir/NDNTrafficServerB.conf &> $workdir/logs/server.log &"
 ssh $CTRL_C "mkdir -p $workdir/logs;\
     sudo nfd &> $workdir/logs/nfd.log &\
     sleep 3;\
-    nrd &> $workdir/logs/nrd.log &\
-    sleep 3;\
     ndn-traffic-server $workdir/NDNTrafficServerC.conf &> $workdir/logs/server.log &"
 
 # start nfd and add nexthop of ndn:/test-mcast to UDP multicast face
 sudo nfd &> $workdir/logs/nfd.log &
 sleep 3
-nrd &> $workdir/logs/nrd.log &
-sleep 3
 faceid=$(nfd-status -f | grep $a_ipaddr | grep -Po 'faceid=.*? ' | sed 's/faceid=//' | sed 's/ //')
 nfdc add-nexthop ndn:/test-mcast $faceid
 
diff --git a/test_ndnpeekpoke/test_ndnpeekpoke.py b/test_ndnpeekpoke/test_ndnpeekpoke.py
index 336b74e..7b2325e 100644
--- a/test_ndnpeekpoke/test_ndnpeekpoke.py
+++ b/test_ndnpeekpoke/test_ndnpeekpoke.py
@@ -29,8 +29,6 @@
     def test_peekpoke(self):
         self.startNfd()
         time.sleep(1)
-        self.startNrd()
-        time.sleep(1)
         pokeInputFile = os.path.abspath("test_ndnpeekpoke/test-poke-input.txt")
         self.startProcess("ndnpoke",
             ["ndnpoke", "ndn:/test/peekpoke"],
diff --git a/test_ndnping/test_ndnping.py b/test_ndnping/test_ndnping.py
index 131b71f..4ee2c3d 100644
--- a/test_ndnping/test_ndnping.py
+++ b/test_ndnping/test_ndnping.py
@@ -26,7 +26,6 @@
     def test_ping(self):
         self.startNfd()
         time.sleep(1)
-        self.startNrd()
         time.sleep(1)
         self.startProcess("ndnpingserver",
             ["ndnpingserver", "-p1", "/test/ndnping"], "-> Starting Ping Server")
diff --git a/test_ndntraffic/test_ndntraffic.py b/test_ndntraffic/test_ndntraffic.py
index a83e450..632c4fe 100644
--- a/test_ndntraffic/test_ndntraffic.py
+++ b/test_ndntraffic/test_ndntraffic.py
@@ -27,8 +27,6 @@
     def test_traffic(self):
         self.startNfd()
         time.sleep(1)
-        self.startNrd()
-        time.sleep(1)
         serverConfigurationFile = os.path.abspath("test_ndntraffic/test-traffic-server.conf")
         self.startProcess("ndn-traffic-server",
             ["ndn-traffic-server", "-c 1", serverConfigurationFile],
diff --git a/test_nfdc/README.md b/test_nfdc/README.md
index c297597..5803770 100644
--- a/test_nfdc/README.md
+++ b/test_nfdc/README.md
@@ -57,10 +57,9 @@
 ## Test case C: Test nfdc register / unregister test case ##
 Start NFD on host A and B.
 On host A, run the following steps:
-1. run nrd on host A
-2. Invoke nfdc register -c 55 ndn:/test-nfdc udp4://$IP4_B1. Pause 2 seconds for connection establishment.
-3. Execute nfd-status. Check the existence of new udp4 face. Check the existence of ndn:/test-nfdc FIB entry, and the correctness of cost on nexthop records.
-4. Invoke nfdc to unregister the prefix ndn:/test-nfdc for FaceId seen in step 3.
-5. Execute nfd-status. Check the non-existence of ndn:/test-nfdc FIB entry.
+1. Invoke nfdc register -c 55 ndn:/test-nfdc udp4://$IP4_B1. Pause 2 seconds for connection establishment.
+2. Execute nfd-status. Check the existence of new udp4 face. Check the existence of ndn:/test-nfdc FIB entry, and the correctness of cost on nexthop records.
+3. Invoke nfdc to unregister the prefix ndn:/test-nfdc for FaceId seen in step 3.
+4. Execute nfd-status. Check the non-existence of ndn:/test-nfdc FIB entry.
 
 
diff --git a/test_nfdc/include.sh b/test_nfdc/include.sh
index 9ad43b5..4e92a89 100755
--- a/test_nfdc/include.sh
+++ b/test_nfdc/include.sh
@@ -5,10 +5,6 @@
 clean_up() {
   r=$(ssh $CTRL_B "sudo killall nfd" 2>&1)
   r=$(sudo killall nfd 2>&1)
-
-  if [[ $testCase == 'C' ]]; then
-    r=$(sudo killall nrd 2>&1)
-  fi
 }
 
 start_nfd() {
@@ -21,13 +17,6 @@
   sleep 2
 }
 
-start_nrd() {
-  # start nfd on localhost
-  sudo nrd &> $workdir/logs/nrd.log &
-
-  sleep 2
-}
-
 
 check_nfd_status_counters() {
   faceId=$1
diff --git a/test_nfdc/nfdc-test.sh b/test_nfdc/nfdc-test.sh
index 862115c..c3c246d 100755
--- a/test_nfdc/nfdc-test.sh
+++ b/test_nfdc/nfdc-test.sh
@@ -154,9 +154,6 @@
 # run test case C: test nfdc register / unregister test case
 elif [[ $testCase == 'C' ]]; then
 
-  # run nrd
-  start_nrd
-
   # Invoke nfdc register a new prefix
   faceId=$(nfdc register -c 55 ndn:/test-nfdc udp4://$IP4_B1 | grep -Po 'FaceId: .*?,' | sed 's/FaceId: //' | sed 's/,//')
   if [[ "ERROR" == $faceId* ]]; then
diff --git a/test_nrd/README.md b/test_nrd/README.md
index 231c1b1..a428080 100644
--- a/test_nrd/README.md
+++ b/test_nrd/README.md
@@ -1,7 +1,7 @@
 Test correctness of NRD prefix registration and FIB updates (without ForwardingFlags processing).
 
 1. Modify $HOME/.ndn/client.conf to choose "protocol=nrd-0.1".
-2. Start NFD and NRD.
+2. Start NFD.
 3. Run nfd-status to obtain FIB.
 4. Start ndn-traffic-server; configuration has one or more non-overlapping prefixes.
 5. Run nfd-status to obtain FIB. Compare new FIB to the FIB from step 3, and determine whether FIB entry is inserted
diff --git a/test_nrd/nrd-test.sh b/test_nrd/nrd-test.sh
index 022cfc3..83407fb 100755
--- a/test_nrd/nrd-test.sh
+++ b/test_nrd/nrd-test.sh
@@ -4,11 +4,9 @@
 }
 mkdir -p logs
 
-# start nfd and nrd
-echo "starting nfd and nrd..."
+# start nfd
+echo "starting nfd..."
 sudo nfd > logs/nfd.log 2>&1 &
-sleep 3
-nrd &> logs/nrd.log &
 sleep 10
 
 # check fib before server starts
diff --git a/test_route_expiration/include.sh b/test_route_expiration/include.sh
index 047a8d3..281e8f1 100644
--- a/test_route_expiration/include.sh
+++ b/test_route_expiration/include.sh
@@ -8,18 +8,11 @@
   sleep 2
 }
 
-start_nrd() {
-  sudo nrd &> $workdir/logs/nrd.log &
-  ssh $CTRL_B "sudo nrd &"
-  sleep 2
-}
-
 set_up() {
   workdir=$(pwd)
   mkdir -p $workdir/logs
 
   start_nfd
-  start_nrd
 }
 
 clean_up() {
diff --git a/test_tcp_udp_tunnel/tcp-udp-tunnel-test.sh b/test_tcp_udp_tunnel/tcp-udp-tunnel-test.sh
index 1e8f9dd..f565335 100755
--- a/test_tcp_udp_tunnel/tcp-udp-tunnel-test.sh
+++ b/test_tcp_udp_tunnel/tcp-udp-tunnel-test.sh
@@ -26,8 +26,6 @@
 # start nfd on host A
 sudo nfd &> logs/nfd.log &
 sleep 2
-nrd &> logs/nrd.log &
-sleep 2
 
 # start nfd and ndn-traffic-server on host D
 echo "starting nfd and ndn-traffic-server on host D..."
@@ -35,8 +33,6 @@
 ssh $CTRL_D "mkdir -p $workdir/logs;\
     sudo nfd &> $workdir/logs/nfd.log &\
     sleep 3;\
-    nrd &> $workdir/logs/nrd.log &\
-    sleep 3;\
     ndn-traffic-server $workdir/NDNTrafficServer.conf > $workdir/logs/server.log 2>&1 &"
 sleep 5
 
diff --git a/test_unixface/unix-face-test.sh b/test_unixface/unix-face-test.sh
index 839a76b..cfc5d67 100755
--- a/test_unixface/unix-face-test.sh
+++ b/test_unixface/unix-face-test.sh
@@ -6,8 +6,6 @@
 }
 sudo nfd &> logs/nfd.log &
 sleep 2
-nrd &> logs/nrd.log &
-sleep 2
 ndn-traffic-server NDNTrafficServer.conf > logs/server.log 2>&1 &
 sleep 2
 echo "Sending interests..."