diff --git a/tests/topotests/bgp_default_ipv4_ipv6_unicast/__init__.py b/tests/topotests/bgp_default_afi_safi/__init__.py
similarity index 100%
rename from tests/topotests/bgp_default_ipv4_ipv6_unicast/__init__.py
rename to tests/topotests/bgp_default_afi_safi/__init__.py
diff --git a/tests/topotests/bgp_default_ipv4_ipv6_unicast/r1/bgpd.conf b/tests/topotests/bgp_default_afi_safi/r1/bgpd.conf
similarity index 100%
rename from tests/topotests/bgp_default_ipv4_ipv6_unicast/r1/bgpd.conf
rename to tests/topotests/bgp_default_afi_safi/r1/bgpd.conf
diff --git a/tests/topotests/bgp_default_ipv4_ipv6_unicast/r1/zebra.conf b/tests/topotests/bgp_default_afi_safi/r1/zebra.conf
similarity index 100%
rename from tests/topotests/bgp_default_ipv4_ipv6_unicast/r1/zebra.conf
rename to tests/topotests/bgp_default_afi_safi/r1/zebra.conf
diff --git a/tests/topotests/bgp_default_ipv4_ipv6_unicast/r2/bgpd.conf b/tests/topotests/bgp_default_afi_safi/r2/bgpd.conf
similarity index 100%
rename from tests/topotests/bgp_default_ipv4_ipv6_unicast/r2/bgpd.conf
rename to tests/topotests/bgp_default_afi_safi/r2/bgpd.conf
diff --git a/tests/topotests/bgp_default_ipv4_ipv6_unicast/r2/zebra.conf b/tests/topotests/bgp_default_afi_safi/r2/zebra.conf
similarity index 100%
rename from tests/topotests/bgp_default_ipv4_ipv6_unicast/r2/zebra.conf
rename to tests/topotests/bgp_default_afi_safi/r2/zebra.conf
diff --git a/tests/topotests/bgp_default_ipv4_ipv6_unicast/r3/bgpd.conf b/tests/topotests/bgp_default_afi_safi/r3/bgpd.conf
similarity index 100%
rename from tests/topotests/bgp_default_ipv4_ipv6_unicast/r3/bgpd.conf
rename to tests/topotests/bgp_default_afi_safi/r3/bgpd.conf
diff --git a/tests/topotests/bgp_default_ipv4_ipv6_unicast/r3/zebra.conf b/tests/topotests/bgp_default_afi_safi/r3/zebra.conf
similarity index 100%
rename from tests/topotests/bgp_default_ipv4_ipv6_unicast/r3/zebra.conf
rename to tests/topotests/bgp_default_afi_safi/r3/zebra.conf
diff --git a/tests/topotests/bgp_default_ipv4_ipv6_unicast/test_bgp-default-ipv4-ipv6-unicast.py b/tests/topotests/bgp_default_afi_safi/test_bgp-default-afi-safi.py
similarity index 100%
rename from tests/topotests/bgp_default_ipv4_ipv6_unicast/test_bgp-default-ipv4-ipv6-unicast.py
rename to tests/topotests/bgp_default_afi_safi/test_bgp-default-afi-safi.py