diff --git a/tests/topotests/isis_topo1_vrf/r1/isisd.conf b/tests/topotests/isis_topo1_vrf/r1/isisd.conf
index 0e8e490c94..4dd681527b 100755
--- a/tests/topotests/isis_topo1_vrf/r1/isisd.conf
+++ b/tests/topotests/isis_topo1_vrf/r1/isisd.conf
@@ -2,9 +2,9 @@ hostname r1
 ! debug isis adj-packets
 ! debug isis events
 ! debug isis update-packets
-interface r1-eth0
- ip router isis 1 vrf r1-cust1
- ipv6 router isis 1 vrf r1-cust1
+interface r1-eth0 vrf r1-cust1
+ ip router isis 1
+ ipv6 router isis 1
  isis circuit-type level-2-only
 !
 router isis 1 vrf r1-cust1 
diff --git a/tests/topotests/isis_topo1_vrf/r2/isisd.conf b/tests/topotests/isis_topo1_vrf/r2/isisd.conf
index 1e9bb9fb7f..955bb5412a 100755
--- a/tests/topotests/isis_topo1_vrf/r2/isisd.conf
+++ b/tests/topotests/isis_topo1_vrf/r2/isisd.conf
@@ -2,9 +2,9 @@ hostname r2
 ! debug isis adj-packets
 ! debug isis events
 ! debug isis update-packets
-interface r2-eth0
- ip router isis 1 vrf r2-cust1
- ipv6 router isis 1 vrf r2-cust1
+interface r2-eth0 vrf r2-cust1
+ ip router isis 1
+ ipv6 router isis 1
  isis circuit-type level-2-only
 !
 router isis 1 vrf r2-cust1
diff --git a/tests/topotests/isis_topo1_vrf/r3/isisd.conf b/tests/topotests/isis_topo1_vrf/r3/isisd.conf
index 93a33f6db2..d127b3aa29 100755
--- a/tests/topotests/isis_topo1_vrf/r3/isisd.conf
+++ b/tests/topotests/isis_topo1_vrf/r3/isisd.conf
@@ -2,14 +2,14 @@ hostname r3
 ! debug isis adj-packets
 ! debug isis events
 ! debug isis update-packets
-interface r3-eth0
- ip router isis 1 vrf r3-cust1
- ipv6 router isis 1 vrf r3-cust1
+interface r3-eth0 vrf r3-cust1
+ ip router isis 1
+ ipv6 router isis 1
  isis circuit-type level-2-only
 !
-interface r3-eth1
- ip router isis 1 vrf r3-cust1
- ipv6 router isis 1 vrf r3-cust1
+interface r3-eth1 vrf r3-cust1
+ ip router isis 1
+ ipv6 router isis 1
  isis circuit-type level-1
 !
 router isis 1 vrf r3-cust1
diff --git a/tests/topotests/isis_topo1_vrf/r4/isisd.conf b/tests/topotests/isis_topo1_vrf/r4/isisd.conf
index b8c0b77f44..fd11b2cf92 100755
--- a/tests/topotests/isis_topo1_vrf/r4/isisd.conf
+++ b/tests/topotests/isis_topo1_vrf/r4/isisd.conf
@@ -5,14 +5,14 @@ hostname r4
 ! debug isis lsp-gen
 ! debug isis lsp-sched
 
-interface r4-eth0
- ip router isis 1 vrf r4-cust1
- ipv6 router isis 1 vrf r4-cust1
+interface r4-eth0 vrf r4-cust1
+ ip router isis 1
+ ipv6 router isis 1
  isis circuit-type level-2-only
 !
-interface r4-eth1
- ip router isis 1 vrf r4-cust1
- ipv6 router isis 1 vrf r4-cust1
+interface r4-eth1 vrf r4-cust1
+ ip router isis 1
+ ipv6 router isis 1
  isis circuit-type level-1
 !
 router isis 1 vrf r4-cust1
diff --git a/tests/topotests/isis_topo1_vrf/r5/isisd.conf b/tests/topotests/isis_topo1_vrf/r5/isisd.conf
index e6febd5dea..67776373f3 100755
--- a/tests/topotests/isis_topo1_vrf/r5/isisd.conf
+++ b/tests/topotests/isis_topo1_vrf/r5/isisd.conf
@@ -2,14 +2,14 @@ hostname r5
 ! debug isis adj-packets
 ! debug isis events
 ! debug isis update-packets
-interface r5-eth0
- ip router isis 1 vrf r5-cust1
- ipv6 router isis 1 vrf r5-cust1
+interface r5-eth0 vrf r5-cust1
+ ip router isis 1
+ ipv6 router isis 1
  isis circuit-type level-1
 !
-interface r5-eth1
- ip router isis 1 vrf r5-cust1
- ipv6 router isis 1 vrf r5-cust1
+interface r5-eth1 vrf r5-cust1
+ ip router isis 1
+ ipv6 router isis 1
  isis circuit-type level-1
 !
 router isis 1 vrf r5-cust1