diff --git a/tests/topotests/ospf_topo1_vrf/__init__.py b/tests/topotests/ospf_netns_vrf/__init__.py
similarity index 100%
rename from tests/topotests/ospf_topo1_vrf/__init__.py
rename to tests/topotests/ospf_netns_vrf/__init__.py
diff --git a/tests/topotests/ospf_topo1_vrf/r1/ospfd.conf b/tests/topotests/ospf_netns_vrf/r1/ospfd.conf
similarity index 100%
rename from tests/topotests/ospf_topo1_vrf/r1/ospfd.conf
rename to tests/topotests/ospf_netns_vrf/r1/ospfd.conf
diff --git a/tests/topotests/ospf_topo1_vrf/r1/ospfroute.txt b/tests/topotests/ospf_netns_vrf/r1/ospfroute.txt
similarity index 100%
rename from tests/topotests/ospf_topo1_vrf/r1/ospfroute.txt
rename to tests/topotests/ospf_netns_vrf/r1/ospfroute.txt
diff --git a/tests/topotests/ospf_topo1_vrf/r1/ospfroute_down.txt b/tests/topotests/ospf_netns_vrf/r1/ospfroute_down.txt
similarity index 100%
rename from tests/topotests/ospf_topo1_vrf/r1/ospfroute_down.txt
rename to tests/topotests/ospf_netns_vrf/r1/ospfroute_down.txt
diff --git a/tests/topotests/ospf_topo1_vrf/r1/zebra.conf b/tests/topotests/ospf_netns_vrf/r1/zebra.conf
similarity index 100%
rename from tests/topotests/ospf_topo1_vrf/r1/zebra.conf
rename to tests/topotests/ospf_netns_vrf/r1/zebra.conf
diff --git a/tests/topotests/ospf_topo1_vrf/r1/zebraroute.txt b/tests/topotests/ospf_netns_vrf/r1/zebraroute.txt
similarity index 100%
rename from tests/topotests/ospf_topo1_vrf/r1/zebraroute.txt
rename to tests/topotests/ospf_netns_vrf/r1/zebraroute.txt
diff --git a/tests/topotests/ospf_topo1_vrf/r1/zebraroutedown.txt b/tests/topotests/ospf_netns_vrf/r1/zebraroutedown.txt
similarity index 100%
rename from tests/topotests/ospf_topo1_vrf/r1/zebraroutedown.txt
rename to tests/topotests/ospf_netns_vrf/r1/zebraroutedown.txt
diff --git a/tests/topotests/ospf_topo1_vrf/r2/ospfd.conf b/tests/topotests/ospf_netns_vrf/r2/ospfd.conf
similarity index 100%
rename from tests/topotests/ospf_topo1_vrf/r2/ospfd.conf
rename to tests/topotests/ospf_netns_vrf/r2/ospfd.conf
diff --git a/tests/topotests/ospf_topo1_vrf/r2/ospfroute.txt b/tests/topotests/ospf_netns_vrf/r2/ospfroute.txt
similarity index 100%
rename from tests/topotests/ospf_topo1_vrf/r2/ospfroute.txt
rename to tests/topotests/ospf_netns_vrf/r2/ospfroute.txt
diff --git a/tests/topotests/ospf_topo1_vrf/r2/ospfroute_down.txt b/tests/topotests/ospf_netns_vrf/r2/ospfroute_down.txt
similarity index 100%
rename from tests/topotests/ospf_topo1_vrf/r2/ospfroute_down.txt
rename to tests/topotests/ospf_netns_vrf/r2/ospfroute_down.txt
diff --git a/tests/topotests/ospf_topo1_vrf/r2/zebra.conf b/tests/topotests/ospf_netns_vrf/r2/zebra.conf
similarity index 100%
rename from tests/topotests/ospf_topo1_vrf/r2/zebra.conf
rename to tests/topotests/ospf_netns_vrf/r2/zebra.conf
diff --git a/tests/topotests/ospf_topo1_vrf/r2/zebraroute.txt b/tests/topotests/ospf_netns_vrf/r2/zebraroute.txt
similarity index 100%
rename from tests/topotests/ospf_topo1_vrf/r2/zebraroute.txt
rename to tests/topotests/ospf_netns_vrf/r2/zebraroute.txt
diff --git a/tests/topotests/ospf_topo1_vrf/r2/zebraroutedown.txt b/tests/topotests/ospf_netns_vrf/r2/zebraroutedown.txt
similarity index 100%
rename from tests/topotests/ospf_topo1_vrf/r2/zebraroutedown.txt
rename to tests/topotests/ospf_netns_vrf/r2/zebraroutedown.txt
diff --git a/tests/topotests/ospf_topo1_vrf/r3/ospfd.conf b/tests/topotests/ospf_netns_vrf/r3/ospfd.conf
similarity index 100%
rename from tests/topotests/ospf_topo1_vrf/r3/ospfd.conf
rename to tests/topotests/ospf_netns_vrf/r3/ospfd.conf
diff --git a/tests/topotests/ospf_topo1_vrf/r3/ospfroute.txt b/tests/topotests/ospf_netns_vrf/r3/ospfroute.txt
similarity index 100%
rename from tests/topotests/ospf_topo1_vrf/r3/ospfroute.txt
rename to tests/topotests/ospf_netns_vrf/r3/ospfroute.txt
diff --git a/tests/topotests/ospf_topo1_vrf/r3/ospfroute_down.txt b/tests/topotests/ospf_netns_vrf/r3/ospfroute_down.txt
similarity index 100%
rename from tests/topotests/ospf_topo1_vrf/r3/ospfroute_down.txt
rename to tests/topotests/ospf_netns_vrf/r3/ospfroute_down.txt
diff --git a/tests/topotests/ospf_topo1_vrf/r3/zebra.conf b/tests/topotests/ospf_netns_vrf/r3/zebra.conf
similarity index 100%
rename from tests/topotests/ospf_topo1_vrf/r3/zebra.conf
rename to tests/topotests/ospf_netns_vrf/r3/zebra.conf
diff --git a/tests/topotests/ospf_topo1_vrf/r3/zebraroute.txt b/tests/topotests/ospf_netns_vrf/r3/zebraroute.txt
similarity index 100%
rename from tests/topotests/ospf_topo1_vrf/r3/zebraroute.txt
rename to tests/topotests/ospf_netns_vrf/r3/zebraroute.txt
diff --git a/tests/topotests/ospf_topo1_vrf/r3/zebraroutedown.txt b/tests/topotests/ospf_netns_vrf/r3/zebraroutedown.txt
similarity index 100%
rename from tests/topotests/ospf_topo1_vrf/r3/zebraroutedown.txt
rename to tests/topotests/ospf_netns_vrf/r3/zebraroutedown.txt
diff --git a/tests/topotests/ospf_topo1_vrf/test_ospf_topo1-vrf.dot b/tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.dot
similarity index 100%
rename from tests/topotests/ospf_topo1_vrf/test_ospf_topo1-vrf.dot
rename to tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.dot
diff --git a/tests/topotests/ospf_topo1_vrf/test_ospf_topo1_vrf.jpg b/tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.jpg
similarity index 100%
rename from tests/topotests/ospf_topo1_vrf/test_ospf_topo1_vrf.jpg
rename to tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.jpg
diff --git a/tests/topotests/ospf_topo1_vrf/test_ospf_topo1_vrf.py b/tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.py
similarity index 99%
rename from tests/topotests/ospf_topo1_vrf/test_ospf_topo1_vrf.py
rename to tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.py
index 44de61d82a..621d8079dc 100644
--- a/tests/topotests/ospf_topo1_vrf/test_ospf_topo1_vrf.py
+++ b/tests/topotests/ospf_netns_vrf/test_ospf_netns_vrf.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 #
-# test_ospf_topo1.py
+# test_ospf_netns_vrf.py
 # Part of NetDEF Topology Tests
 #
 # Copyright (c) 2017 by
@@ -23,7 +23,7 @@
 #
 
 """
-test_ospf_topo1.py: Test the FRR OSPF routing daemon.
+test_ospf_netns_vrf.py: Test OSPF with Network Namespace VRFs.
 """
 
 import os