diff --git a/test/case/ietf_hardware/usb/Readme.adoc b/test/case/ietf_hardware/usb/Readme.adoc
index 0247fcde..b14ebce1 100644
--- a/test/case/ietf_hardware/usb/Readme.adoc
+++ b/test/case/ietf_hardware/usb/Readme.adoc
@@ -11,17 +11,14 @@ port is handled correctly.
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/ietf_hardware/usb/topology.png[USB configuration topology]
-
+image::../../test/case/ietf_hardware/usb/topology.png[USB configuration topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/ietf_hardware/usb/topology.png[USB configuration topology]
-
+image::usb/topology.png[USB configuration topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[USB configuration topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/ietf_hardware/usb_two_ports/Readme.adoc b/test/case/ietf_hardware/usb_two_ports/Readme.adoc
index 150e66d0..9ecae585 100644
--- a/test/case/ietf_hardware/usb_two_ports/Readme.adoc
+++ b/test/case/ietf_hardware/usb_two_ports/Readme.adoc
@@ -5,17 +5,14 @@ when having two USB ports.
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/ietf_hardware/usb_two_ports/topology.png[USB configuration with two USB ports topology]
-
+image::../../test/case/ietf_hardware/usb_two_ports/topology.png[USB configuration with two USB ports topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/ietf_hardware/usb_two_ports/topology.png[USB configuration with two USB ports topology]
-
+image::usb_two_ports/topology.png[USB configuration with two USB ports topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[USB configuration with two USB ports topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/ietf_interfaces/iface_phys_address/Readme.adoc b/test/case/ietf_interfaces/iface_phys_address/Readme.adoc
index 5a279d29..3bb1f1bf 100644
--- a/test/case/ietf_interfaces/iface_phys_address/Readme.adoc
+++ b/test/case/ietf_interfaces/iface_phys_address/Readme.adoc
@@ -4,17 +4,14 @@ Test possibility to set mac address
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/ietf_interfaces/iface_phys_address/topology.png[Custom MAC address on interface topology]
-
+image::../../test/case/ietf_interfaces/iface_phys_address/topology.png[Custom MAC address on interface topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/ietf_interfaces/iface_phys_address/topology.png[Custom MAC address on interface topology]
-
+image::iface_phys_address/topology.png[Custom MAC address on interface topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Custom MAC address on interface topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/ietf_interfaces/iface_status/Readme.adoc b/test/case/ietf_interfaces/iface_status/Readme.adoc
index f6b2176e..04e6abc6 100644
--- a/test/case/ietf_interfaces/iface_status/Readme.adoc
+++ b/test/case/ietf_interfaces/iface_status/Readme.adoc
@@ -4,17 +4,14 @@ Check that interface status works
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/ietf_interfaces/iface_status/topology.png[Interface status topology]
-
+image::../../test/case/ietf_interfaces/iface_status/topology.png[Interface status topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/ietf_interfaces/iface_status/topology.png[Interface status topology]
-
+image::iface_status/topology.png[Interface status topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Interface status topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/ietf_interfaces/ipv4_address/Readme.adoc b/test/case/ietf_interfaces/ipv4_address/Readme.adoc
index 306df83f..135583e0 100644
--- a/test/case/ietf_interfaces/ipv4_address/Readme.adoc
+++ b/test/case/ietf_interfaces/ipv4_address/Readme.adoc
@@ -4,17 +4,14 @@ Test that it is possible to set and remove the IPv4 address on a interface
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/ietf_interfaces/ipv4_address/topology.png[Interface with IPv4 topology]
-
+image::../../test/case/ietf_interfaces/ipv4_address/topology.png[Interface with IPv4 topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/ietf_interfaces/ipv4_address/topology.png[Interface with IPv4 topology]
-
+image::ipv4_address/topology.png[Interface with IPv4 topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Interface with IPv4 topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/ietf_interfaces/ipv6_address/Readme.adoc b/test/case/ietf_interfaces/ipv6_address/Readme.adoc
index 7a7c2ba9..2177913b 100644
--- a/test/case/ietf_interfaces/ipv6_address/Readme.adoc
+++ b/test/case/ietf_interfaces/ipv6_address/Readme.adoc
@@ -5,17 +5,14 @@ See issue #473 for details.
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/ietf_interfaces/ipv6_address/topology.png[Interface IPv6 autoconf for bridges topology]
-
+image::../../test/case/ietf_interfaces/ipv6_address/topology.png[Interface IPv6 autoconf for bridges topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/ietf_interfaces/ipv6_address/topology.png[Interface IPv6 autoconf for bridges topology]
-
+image::ipv6_address/topology.png[Interface IPv6 autoconf for bridges topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Interface IPv6 autoconf for bridges topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/ietf_interfaces/routing_basic/Readme.adoc b/test/case/ietf_interfaces/routing_basic/Readme.adoc
index 89c85ec6..6fdb70ab 100644
--- a/test/case/ietf_interfaces/routing_basic/Readme.adoc
+++ b/test/case/ietf_interfaces/routing_basic/Readme.adoc
@@ -4,17 +4,14 @@ Test that ipv4 forwarding setting in configuration is respected
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/ietf_interfaces/routing_basic/topology.png[Routing basic topology]
-
+image::../../test/case/ietf_interfaces/routing_basic/topology.png[Routing basic topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/ietf_interfaces/routing_basic/topology.png[Routing basic topology]
-
+image::routing_basic/topology.png[Routing basic topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Routing basic topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/ietf_interfaces/vlan_ping/Readme.adoc b/test/case/ietf_interfaces/vlan_ping/Readme.adoc
index 0c535286..9e60afad 100644
--- a/test/case/ietf_interfaces/vlan_ping/Readme.adoc
+++ b/test/case/ietf_interfaces/vlan_ping/Readme.adoc
@@ -4,17 +4,14 @@ Very basic test if the VLAN configuration works.
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/ietf_interfaces/vlan_ping/topology.png[VLAN ping connectivity topology]
-
+image::../../test/case/ietf_interfaces/vlan_ping/topology.png[VLAN ping connectivity topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/ietf_interfaces/vlan_ping/topology.png[VLAN ping connectivity topology]
-
+image::vlan_ping/topology.png[VLAN ping connectivity topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[VLAN ping connectivity topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/ietf_routing/ospf_basic/Readme.adoc b/test/case/ietf_routing/ospf_basic/Readme.adoc
index 946cba79..3e4a0d61 100644
--- a/test/case/ietf_routing/ospf_basic/Readme.adoc
+++ b/test/case/ietf_routing/ospf_basic/Readme.adoc
@@ -5,17 +5,14 @@ and that they exchange routes, ending with a simple connectivity check.
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/ietf_routing/ospf_basic/topology.png[OSPF Basic topology]
-
+image::../../test/case/ietf_routing/ospf_basic/topology.png[OSPF Basic topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/ietf_routing/ospf_basic/topology.png[OSPF Basic topology]
-
+image::ospf_basic/topology.png[OSPF Basic topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[OSPF Basic topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/ietf_routing/ospf_basic/topology.png b/test/case/ietf_routing/ospf_basic/topology.png
index cdf4e35b..8e985ef3 100644
Binary files a/test/case/ietf_routing/ospf_basic/topology.png and b/test/case/ietf_routing/ospf_basic/topology.png differ
diff --git a/test/case/ietf_routing/ospf_multiarea/Readme.adoc b/test/case/ietf_routing/ospf_multiarea/Readme.adoc
index 6e8f4602..f0ac1aff 100644
--- a/test/case/ietf_routing/ospf_multiarea/Readme.adoc
+++ b/test/case/ietf_routing/ospf_multiarea/Readme.adoc
@@ -6,17 +6,14 @@ link breaks using BFD (not implemented in infamy though)
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/ietf_routing/ospf_multiarea/topology.png[OSPF with multiple areas topology]
-
+image::../../test/case/ietf_routing/ospf_multiarea/topology.png[OSPF with multiple areas topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/ietf_routing/ospf_multiarea/topology.png[OSPF with multiple areas topology]
-
+image::ospf_multiarea/topology.png[OSPF with multiple areas topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[OSPF with multiple areas topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/ietf_routing/ospf_multiarea/topology.png b/test/case/ietf_routing/ospf_multiarea/topology.png
index 7bd3db30..8caf9b51 100644
Binary files a/test/case/ietf_routing/ospf_multiarea/topology.png and b/test/case/ietf_routing/ospf_multiarea/topology.png differ
diff --git a/test/case/ietf_routing/ospf_unnumbered_interface/Readme.adoc b/test/case/ietf_routing/ospf_unnumbered_interface/Readme.adoc
index 3d52c8fc..a91d2539 100644
--- a/test/case/ietf_routing/ospf_unnumbered_interface/Readme.adoc
+++ b/test/case/ietf_routing/ospf_unnumbered_interface/Readme.adoc
@@ -9,17 +9,14 @@ configuration and passive to function
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/ietf_routing/ospf_unnumbered_interface/topology.png[OSPF unnumbered interfaces topology]
-
+image::../../test/case/ietf_routing/ospf_unnumbered_interface/topology.png[OSPF unnumbered interfaces topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/ietf_routing/ospf_unnumbered_interface/topology.png[OSPF unnumbered interfaces topology]
-
+image::ospf_unnumbered_interface/topology.png[OSPF unnumbered interfaces topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[OSPF unnumbered interfaces topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/ietf_routing/ospf_unnumbered_interface/topology.png b/test/case/ietf_routing/ospf_unnumbered_interface/topology.png
index 2e047f7f..1e0aebf6 100644
Binary files a/test/case/ietf_routing/ospf_unnumbered_interface/topology.png and b/test/case/ietf_routing/ospf_unnumbered_interface/topology.png differ
diff --git a/test/case/ietf_routing/static_routing/Readme.adoc b/test/case/ietf_routing/static_routing/Readme.adoc
index bb1457f5..a6bbfea0 100644
--- a/test/case/ietf_routing/static_routing/Readme.adoc
+++ b/test/case/ietf_routing/static_routing/Readme.adoc
@@ -5,17 +5,14 @@ works as expected
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/ietf_routing/static_routing/topology.png[Static routing topology]
-
+image::../../test/case/ietf_routing/static_routing/topology.png[Static routing topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/ietf_routing/static_routing/topology.png[Static routing topology]
-
+image::static_routing/topology.png[Static routing topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Static routing topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/ietf_routing/static_routing/topology.png b/test/case/ietf_routing/static_routing/topology.png
index 8f53641c..ee1efac4 100644
Binary files a/test/case/ietf_routing/static_routing/topology.png and b/test/case/ietf_routing/static_routing/topology.png differ
diff --git a/test/case/ietf_syslog/basic/Readme.adoc b/test/case/ietf_syslog/basic/Readme.adoc
index bd435901..f77ea932 100644
--- a/test/case/ietf_syslog/basic/Readme.adoc
+++ b/test/case/ietf_syslog/basic/Readme.adoc
@@ -5,17 +5,14 @@
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/ietf_syslog/basic/topology.png[Syslog Basic topology]
-
+image::../../test/case/ietf_syslog/basic/topology.png[Syslog Basic topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/ietf_syslog/basic/topology.png[Syslog Basic topology]
-
+image::basic/topology.png[Syslog Basic topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Syslog Basic topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/ietf_syslog/remote/Readme.adoc b/test/case/ietf_syslog/remote/Readme.adoc
index 53ac2c15..c25df5ce 100644
--- a/test/case/ietf_syslog/remote/Readme.adoc
+++ b/test/case/ietf_syslog/remote/Readme.adoc
@@ -4,17 +4,14 @@ Verify logging to remote, acting as a remote, and RFC5424 log format.
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/ietf_syslog/remote/topology.png[Remote syslog topology]
-
+image::../../test/case/ietf_syslog/remote/topology.png[Remote syslog topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/ietf_syslog/remote/topology.png[Remote syslog topology]
-
+image::remote/topology.png[Remote syslog topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Remote syslog topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/ietf_system/add_delete_user/Readme.adoc b/test/case/ietf_system/add_delete_user/Readme.adoc
index 5e684939..e9fd3325 100644
--- a/test/case/ietf_system/add_delete_user/Readme.adoc
+++ b/test/case/ietf_system/add_delete_user/Readme.adoc
@@ -4,17 +4,14 @@ Verify that it is possible to add a user, and then remove it
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/ietf_system/add_delete_user/topology.png[Add/delete user topology]
-
+image::../../test/case/ietf_system/add_delete_user/topology.png[Add/delete user topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/ietf_system/add_delete_user/topology.png[Add/delete user topology]
-
+image::add_delete_user/topology.png[Add/delete user topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Add/delete user topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/ietf_system/add_delete_user/topology.dot b/test/case/ietf_system/add_delete_user/topology.dot
deleted file mode 100644
index dc72e816..00000000
--- a/test/case/ietf_system/add_delete_user/topology.dot
+++ /dev/null
@@ -1,23 +0,0 @@
-graph "1x1" {
-	layout="neato";
-	overlap="false";
-	esep="+20";
-
-        node [shape=record, fontname="monospace"];
-	edge [color="cornflowerblue", penwidth="2"];
-
-	host [
-	    label="host | { <tgt> tgt }",
-	    pos="0,12!",
-	    kind="controller",
-	];
-
-        target [
-	    label="{ <mgmt> mgmt } | target",
-	    pos="10,12!",
-
-	    kind="infix",
-	];
-
-	host:tgt -- target:mgmt [kind=mgmt]
-}
diff --git a/test/case/ietf_system/add_delete_user/topology.dot b/test/case/ietf_system/add_delete_user/topology.dot
new file mode 120000
index 00000000..02b78869
--- /dev/null
+++ b/test/case/ietf_system/add_delete_user/topology.dot
@@ -0,0 +1 @@
+../../../infamy/topologies/1x1.dot
\ No newline at end of file
diff --git a/test/case/ietf_system/hostname/Readme.adoc b/test/case/ietf_system/hostname/Readme.adoc
index a94c383e..57d95895 100644
--- a/test/case/ietf_system/hostname/Readme.adoc
+++ b/test/case/ietf_system/hostname/Readme.adoc
@@ -4,17 +4,14 @@ Verify that it is possible to change hostname
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/ietf_system/hostname/topology.png[Set hostname topology]
-
+image::../../test/case/ietf_system/hostname/topology.png[Set hostname topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/ietf_system/hostname/topology.png[Set hostname topology]
-
+image::hostname/topology.png[Set hostname topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Set hostname topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/ietf_system/hostname/topology.dot b/test/case/ietf_system/hostname/topology.dot
deleted file mode 100644
index dc72e816..00000000
--- a/test/case/ietf_system/hostname/topology.dot
+++ /dev/null
@@ -1,23 +0,0 @@
-graph "1x1" {
-	layout="neato";
-	overlap="false";
-	esep="+20";
-
-        node [shape=record, fontname="monospace"];
-	edge [color="cornflowerblue", penwidth="2"];
-
-	host [
-	    label="host | { <tgt> tgt }",
-	    pos="0,12!",
-	    kind="controller",
-	];
-
-        target [
-	    label="{ <mgmt> mgmt } | target",
-	    pos="10,12!",
-
-	    kind="infix",
-	];
-
-	host:tgt -- target:mgmt [kind=mgmt]
-}
diff --git a/test/case/ietf_system/hostname/topology.dot b/test/case/ietf_system/hostname/topology.dot
new file mode 120000
index 00000000..02b78869
--- /dev/null
+++ b/test/case/ietf_system/hostname/topology.dot
@@ -0,0 +1 @@
+../../../infamy/topologies/1x1.dot
\ No newline at end of file
diff --git a/test/case/ietf_system/timezone/Readme.adoc b/test/case/ietf_system/timezone/Readme.adoc
index 1c82e124..fb6bd20a 100644
--- a/test/case/ietf_system/timezone/Readme.adoc
+++ b/test/case/ietf_system/timezone/Readme.adoc
@@ -4,17 +4,14 @@ Verify that it is possible to set timezone
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/ietf_system/timezone/topology.png[Set timezone topology]
-
+image::../../test/case/ietf_system/timezone/topology.png[Set timezone topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/ietf_system/timezone/topology.png[Set timezone topology]
-
+image::timezone/topology.png[Set timezone topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Set timezone topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/ietf_system/timezone/topology.dot b/test/case/ietf_system/timezone/topology.dot
deleted file mode 100644
index dc72e816..00000000
--- a/test/case/ietf_system/timezone/topology.dot
+++ /dev/null
@@ -1,23 +0,0 @@
-graph "1x1" {
-	layout="neato";
-	overlap="false";
-	esep="+20";
-
-        node [shape=record, fontname="monospace"];
-	edge [color="cornflowerblue", penwidth="2"];
-
-	host [
-	    label="host | { <tgt> tgt }",
-	    pos="0,12!",
-	    kind="controller",
-	];
-
-        target [
-	    label="{ <mgmt> mgmt } | target",
-	    pos="10,12!",
-
-	    kind="infix",
-	];
-
-	host:tgt -- target:mgmt [kind=mgmt]
-}
diff --git a/test/case/ietf_system/timezone/topology.dot b/test/case/ietf_system/timezone/topology.dot
new file mode 120000
index 00000000..02b78869
--- /dev/null
+++ b/test/case/ietf_system/timezone/topology.dot
@@ -0,0 +1 @@
+../../../infamy/topologies/1x1.dot
\ No newline at end of file
diff --git a/test/case/ietf_system/timezone_utc_offset/Readme.adoc b/test/case/ietf_system/timezone_utc_offset/Readme.adoc
index 40c60424..4c507280 100644
--- a/test/case/ietf_system/timezone_utc_offset/Readme.adoc
+++ b/test/case/ietf_system/timezone_utc_offset/Readme.adoc
@@ -4,17 +4,14 @@ Verify that it is possible to set timezone using UTC offset
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/ietf_system/timezone_utc_offset/topology.png[Set timezone with UTC offset topology]
-
+image::../../test/case/ietf_system/timezone_utc_offset/topology.png[Set timezone with UTC offset topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/ietf_system/timezone_utc_offset/topology.png[Set timezone with UTC offset topology]
-
+image::timezone_utc_offset/topology.png[Set timezone with UTC offset topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Set timezone with UTC offset topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/ietf_system/timezone_utc_offset/topology.dot b/test/case/ietf_system/timezone_utc_offset/topology.dot
deleted file mode 100644
index dc72e816..00000000
--- a/test/case/ietf_system/timezone_utc_offset/topology.dot
+++ /dev/null
@@ -1,23 +0,0 @@
-graph "1x1" {
-	layout="neato";
-	overlap="false";
-	esep="+20";
-
-        node [shape=record, fontname="monospace"];
-	edge [color="cornflowerblue", penwidth="2"];
-
-	host [
-	    label="host | { <tgt> tgt }",
-	    pos="0,12!",
-	    kind="controller",
-	];
-
-        target [
-	    label="{ <mgmt> mgmt } | target",
-	    pos="10,12!",
-
-	    kind="infix",
-	];
-
-	host:tgt -- target:mgmt [kind=mgmt]
-}
diff --git a/test/case/ietf_system/timezone_utc_offset/topology.dot b/test/case/ietf_system/timezone_utc_offset/topology.dot
new file mode 120000
index 00000000..02b78869
--- /dev/null
+++ b/test/case/ietf_system/timezone_utc_offset/topology.dot
@@ -0,0 +1 @@
+../../../infamy/topologies/1x1.dot
\ No newline at end of file
diff --git a/test/case/ietf_system/upgrade/Readme.adoc b/test/case/ietf_system/upgrade/Readme.adoc
index 355a1f5e..e7cce515 100644
--- a/test/case/ietf_system/upgrade/Readme.adoc
+++ b/test/case/ietf_system/upgrade/Readme.adoc
@@ -4,17 +4,14 @@ Verify it is possible to upgrade
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/ietf_system/upgrade/topology.png[Upgrade topology]
-
+image::../../test/case/ietf_system/upgrade/topology.png[Upgrade topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/ietf_system/upgrade/topology.png[Upgrade topology]
-
+image::upgrade/topology.png[Upgrade topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Upgrade topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/ietf_system/user_admin/Readme.adoc b/test/case/ietf_system/user_admin/Readme.adoc
index 0d8ab980..20b29966 100644
--- a/test/case/ietf_system/user_admin/Readme.adoc
+++ b/test/case/ietf_system/user_admin/Readme.adoc
@@ -7,17 +7,14 @@
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/ietf_system/user_admin/topology.png[Add admin user topology]
-
+image::../../test/case/ietf_system/user_admin/topology.png[Add admin user topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/ietf_system/user_admin/topology.png[Add admin user topology]
-
+image::user_admin/topology.png[Add admin user topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Add admin user topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/ietf_system/user_admin/topology.dot b/test/case/ietf_system/user_admin/topology.dot
deleted file mode 100644
index dc72e816..00000000
--- a/test/case/ietf_system/user_admin/topology.dot
+++ /dev/null
@@ -1,23 +0,0 @@
-graph "1x1" {
-	layout="neato";
-	overlap="false";
-	esep="+20";
-
-        node [shape=record, fontname="monospace"];
-	edge [color="cornflowerblue", penwidth="2"];
-
-	host [
-	    label="host | { <tgt> tgt }",
-	    pos="0,12!",
-	    kind="controller",
-	];
-
-        target [
-	    label="{ <mgmt> mgmt } | target",
-	    pos="10,12!",
-
-	    kind="infix",
-	];
-
-	host:tgt -- target:mgmt [kind=mgmt]
-}
diff --git a/test/case/ietf_system/user_admin/topology.dot b/test/case/ietf_system/user_admin/topology.dot
new file mode 120000
index 00000000..02b78869
--- /dev/null
+++ b/test/case/ietf_system/user_admin/topology.dot
@@ -0,0 +1 @@
+../../../infamy/topologies/1x1.dot
\ No newline at end of file
diff --git a/test/case/infix_containers/container_basic/Readme.adoc b/test/case/infix_containers/container_basic/Readme.adoc
index 7b9ad2b7..541e6658 100644
--- a/test/case/infix_containers/container_basic/Readme.adoc
+++ b/test/case/infix_containers/container_basic/Readme.adoc
@@ -8,17 +8,14 @@ The RPC actions: stop + start, and restart are also verified.
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/infix_containers/container_basic/topology.png[Container basic topology]
-
+image::../../test/case/infix_containers/container_basic/topology.png[Container basic topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/infix_containers/container_basic/topology.png[Container basic topology]
-
+image::container_basic/topology.png[Container basic topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Container basic topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/infix_containers/container_bridge/Readme.adoc b/test/case/infix_containers/container_bridge/Readme.adoc
index 61ecec30..e269b6ab 100644
--- a/test/case/infix_containers/container_bridge/Readme.adoc
+++ b/test/case/infix_containers/container_bridge/Readme.adoc
@@ -6,17 +6,14 @@ mounts, i.e., custom index.html from running-config.
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/infix_containers/container_bridge/topology.png[Container with bridge network topology]
-
+image::../../test/case/infix_containers/container_bridge/topology.png[Container with bridge network topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/infix_containers/container_bridge/topology.png[Container with bridge network topology]
-
+image::container_bridge/topology.png[Container with bridge network topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Container with bridge network topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/infix_containers/container_phys/Readme.adoc b/test/case/infix_containers/container_phys/Readme.adoc
index 1e76b512..fff617ed 100644
--- a/test/case/infix_containers/container_phys/Readme.adoc
+++ b/test/case/infix_containers/container_phys/Readme.adoc
@@ -5,17 +5,14 @@ given a physical interface instead of an end of a VETH pair.
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/infix_containers/container_phys/topology.png[Container with physical interface topology]
-
+image::../../test/case/infix_containers/container_phys/topology.png[Container with physical interface topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/infix_containers/container_phys/topology.png[Container with physical interface topology]
-
+image::container_phys/topology.png[Container with physical interface topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Container with physical interface topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/infix_containers/container_veth/Readme.adoc b/test/case/infix_containers/container_veth/Readme.adoc
index dbd3062e..ba61cdbf 100644
--- a/test/case/infix_containers/container_veth/Readme.adoc
+++ b/test/case/infix_containers/container_veth/Readme.adoc
@@ -5,17 +5,14 @@ regular bridge, a VETH pair connects the container to the bridge.
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/infix_containers/container_veth/topology.png[Container with VETH pair topology]
-
+image::../../test/case/infix_containers/container_veth/topology.png[Container with VETH pair topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/infix_containers/container_veth/topology.png[Container with VETH pair topology]
-
+image::container_veth/topology.png[Container with VETH pair topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Container with VETH pair topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/infix_dhcp/dhcp_basic/Readme.adoc b/test/case/infix_dhcp/dhcp_basic/Readme.adoc
index 17f491cc..afbf1724 100644
--- a/test/case/infix_dhcp/dhcp_basic/Readme.adoc
+++ b/test/case/infix_dhcp/dhcp_basic/Readme.adoc
@@ -6,17 +6,14 @@ from a DHCP server and checks that the lease is set on the
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/infix_dhcp/dhcp_basic/topology.png[DHCP Basic topology]
-
+image::../../test/case/infix_dhcp/dhcp_basic/topology.png[DHCP Basic topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/infix_dhcp/dhcp_basic/topology.png[DHCP Basic topology]
-
+image::dhcp_basic/topology.png[DHCP Basic topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[DHCP Basic topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/infix_dhcp/dhcp_router/Readme.adoc b/test/case/infix_dhcp/dhcp_router/Readme.adoc
index c0ada24b..5cf16840 100644
--- a/test/case/infix_dhcp/dhcp_router/Readme.adoc
+++ b/test/case/infix_dhcp/dhcp_router/Readme.adoc
@@ -5,17 +5,14 @@ and that exist in operational datastore
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/infix_dhcp/dhcp_router/topology.png[DHCP router topology]
-
+image::../../test/case/infix_dhcp/dhcp_router/topology.png[DHCP router topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/infix_dhcp/dhcp_router/topology.png[DHCP router topology]
-
+image::dhcp_router/topology.png[DHCP router topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[DHCP router topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/infix_dhcp/dhcp_routes/Readme.adoc b/test/case/infix_dhcp/dhcp_routes/Readme.adoc
index d74f9098..472d1617 100644
--- a/test/case/infix_dhcp/dhcp_routes/Readme.adoc
+++ b/test/case/infix_dhcp/dhcp_routes/Readme.adoc
@@ -5,17 +5,14 @@ the operational datastore
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/infix_dhcp/dhcp_routes/topology.png[DHCP router topology]
-
+image::../../test/case/infix_dhcp/dhcp_routes/topology.png[DHCP router topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/infix_dhcp/dhcp_routes/topology.png[DHCP router topology]
-
+image::dhcp_routes/topology.png[DHCP router topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[DHCP router topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/infix_interfaces/bridge_basic/Readme.adoc b/test/case/infix_interfaces/bridge_basic/Readme.adoc
index 1e765e0c..aec7a827 100644
--- a/test/case/infix_interfaces/bridge_basic/Readme.adoc
+++ b/test/case/infix_interfaces/bridge_basic/Readme.adoc
@@ -4,17 +4,14 @@ Test basic connectivity to a bridge
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/infix_interfaces/bridge_basic/topology.png[Bridge basic topology]
-
+image::../../test/case/infix_interfaces/bridge_basic/topology.png[Bridge basic topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/infix_interfaces/bridge_basic/topology.png[Bridge basic topology]
-
+image::bridge_basic/topology.png[Bridge basic topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Bridge basic topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/infix_interfaces/bridge_fwd_dual_dut/Readme.adoc b/test/case/infix_interfaces/bridge_fwd_dual_dut/Readme.adoc
index c76b4b65..e3beed7c 100644
--- a/test/case/infix_interfaces/bridge_fwd_dual_dut/Readme.adoc
+++ b/test/case/infix_interfaces/bridge_fwd_dual_dut/Readme.adoc
@@ -4,17 +4,14 @@ Ping through both DUTs using bridged ports.
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/infix_interfaces/bridge_fwd_dual_dut/topology.png[Bridge forwarding dual DUTs topology]
-
+image::../../test/case/infix_interfaces/bridge_fwd_dual_dut/topology.png[Bridge forwarding dual DUTs topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/infix_interfaces/bridge_fwd_dual_dut/topology.png[Bridge forwarding dual DUTs topology]
-
+image::bridge_fwd_dual_dut/topology.png[Bridge forwarding dual DUTs topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Bridge forwarding dual DUTs topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/infix_interfaces/bridge_fwd_sgl_dut/Readme.adoc b/test/case/infix_interfaces/bridge_fwd_sgl_dut/Readme.adoc
index df628f6c..ca90ba3b 100644
--- a/test/case/infix_interfaces/bridge_fwd_sgl_dut/Readme.adoc
+++ b/test/case/infix_interfaces/bridge_fwd_sgl_dut/Readme.adoc
@@ -4,17 +4,14 @@ Tests forwarding through a DUT with two bridged interfaces
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/infix_interfaces/bridge_fwd_sgl_dut/topology.png[Bridge forwarding single DUTs topology]
-
+image::../../test/case/infix_interfaces/bridge_fwd_sgl_dut/topology.png[Bridge forwarding single DUTs topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/infix_interfaces/bridge_fwd_sgl_dut/topology.png[Bridge forwarding single DUTs topology]
-
+image::bridge_fwd_sgl_dut/topology.png[Bridge forwarding single DUTs topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Bridge forwarding single DUTs topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/infix_interfaces/bridge_veth/Readme.adoc b/test/case/infix_interfaces/bridge_veth/Readme.adoc
index db99ee85..08e151df 100644
--- a/test/case/infix_interfaces/bridge_veth/Readme.adoc
+++ b/test/case/infix_interfaces/bridge_veth/Readme.adoc
@@ -5,17 +5,14 @@ veth and bridge it with a physical port
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/infix_interfaces/bridge_veth/topology.png[Bridge with a physical port and a veth topology]
-
+image::../../test/case/infix_interfaces/bridge_veth/topology.png[Bridge with a physical port and a veth topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/infix_interfaces/bridge_veth/topology.png[Bridge with a physical port and a veth topology]
-
+image::bridge_veth/topology.png[Bridge with a physical port and a veth topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Bridge with a physical port and a veth topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/infix_interfaces/bridge_vlan/Readme.adoc b/test/case/infix_interfaces/bridge_vlan/Readme.adoc
index 37241e36..2d7a34a7 100644
--- a/test/case/infix_interfaces/bridge_vlan/Readme.adoc
+++ b/test/case/infix_interfaces/bridge_vlan/Readme.adoc
@@ -4,17 +4,14 @@ Basic test of VLAN functionality in a bridge
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/infix_interfaces/bridge_vlan/topology.png[Bridge VLAN topology]
-
+image::../../test/case/infix_interfaces/bridge_vlan/topology.png[Bridge VLAN topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/infix_interfaces/bridge_vlan/topology.png[Bridge VLAN topology]
-
+image::bridge_vlan/topology.png[Bridge VLAN topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Bridge VLAN topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/infix_interfaces/bridge_vlan_separation/Readme.adoc b/test/case/infix_interfaces/bridge_vlan_separation/Readme.adoc
index 02ef8fb5..8de54e85 100644
--- a/test/case/infix_interfaces/bridge_vlan_separation/Readme.adoc
+++ b/test/case/infix_interfaces/bridge_vlan_separation/Readme.adoc
@@ -4,17 +4,14 @@ Test that two VLAN is correctly separaretade in the bridge
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/infix_interfaces/bridge_vlan_separation/topology.png[Bridge VLAN separation topology]
-
+image::../../test/case/infix_interfaces/bridge_vlan_separation/topology.png[Bridge VLAN separation topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/infix_interfaces/bridge_vlan_separation/topology.png[Bridge VLAN separation topology]
-
+image::bridge_vlan_separation/topology.png[Bridge VLAN separation topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Bridge VLAN separation topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/infix_interfaces/dual_bridge/Readme.adoc b/test/case/infix_interfaces/dual_bridge/Readme.adoc
index 6164f999..2103ec8f 100644
--- a/test/case/infix_interfaces/dual_bridge/Readme.adoc
+++ b/test/case/infix_interfaces/dual_bridge/Readme.adoc
@@ -4,17 +4,14 @@ Test that it is possible to ping a bridge through a bridge to another bridge
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/infix_interfaces/dual_bridge/topology.png[Dual bridges topology]
-
+image::../../test/case/infix_interfaces/dual_bridge/topology.png[Dual bridges topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/infix_interfaces/dual_bridge/topology.png[Dual bridges topology]
-
+image::dual_bridge/topology.png[Dual bridges topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Dual bridges topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/infix_interfaces/igmp_basic/Readme.adoc b/test/case/infix_interfaces/igmp_basic/Readme.adoc
index 47100399..abcda86e 100644
--- a/test/case/infix_interfaces/igmp_basic/Readme.adoc
+++ b/test/case/infix_interfaces/igmp_basic/Readme.adoc
@@ -5,17 +5,14 @@ the flooding stops as soon a join arrives
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/infix_interfaces/igmp_basic/topology.png[IGMP basic topology]
-
+image::../../test/case/infix_interfaces/igmp_basic/topology.png[IGMP basic topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/infix_interfaces/igmp_basic/topology.png[IGMP basic topology]
-
+image::igmp_basic/topology.png[IGMP basic topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[IGMP basic topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/infix_interfaces/igmp_vlan/Readme.adoc b/test/case/infix_interfaces/igmp_vlan/Readme.adoc
index 1ff7e57f..9bd2c5fc 100644
--- a/test/case/infix_interfaces/igmp_vlan/Readme.adoc
+++ b/test/case/infix_interfaces/igmp_vlan/Readme.adoc
@@ -4,17 +4,14 @@ Test tagged IGMP control traffic and that VLAN separation is respected for multi
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/infix_interfaces/igmp_vlan/topology.png[IGMP VLAN topology]
-
+image::../../test/case/infix_interfaces/igmp_vlan/topology.png[IGMP VLAN topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/infix_interfaces/igmp_vlan/topology.png[IGMP VLAN topology]
-
+image::igmp_vlan/topology.png[IGMP VLAN topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[IGMP VLAN topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/infix_interfaces/ipv4_autoconf/Readme.adoc b/test/case/infix_interfaces/ipv4_autoconf/Readme.adoc
index 9de0be99..d5e669bf 100644
--- a/test/case/infix_interfaces/ipv4_autoconf/Readme.adoc
+++ b/test/case/infix_interfaces/ipv4_autoconf/Readme.adoc
@@ -4,17 +4,14 @@ Verifies that linklocal (ZeroConf) work as expected
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/infix_interfaces/ipv4_autoconf/topology.png[IPv4 linklocal topology]
-
+image::../../test/case/infix_interfaces/ipv4_autoconf/topology.png[IPv4 linklocal topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/infix_interfaces/ipv4_autoconf/topology.png[IPv4 linklocal topology]
-
+image::ipv4_autoconf/topology.png[IPv4 linklocal topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[IPv4 linklocal topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/infix_interfaces/static_multicast_filters/Readme.adoc b/test/case/infix_interfaces/static_multicast_filters/Readme.adoc
index e09df3fd..dfde902b 100644
--- a/test/case/infix_interfaces/static_multicast_filters/Readme.adoc
+++ b/test/case/infix_interfaces/static_multicast_filters/Readme.adoc
@@ -5,17 +5,14 @@ enabled when using static multicast filters)
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/infix_interfaces/static_multicast_filters/topology.png[Static multicast filters topology]
-
+image::../../test/case/infix_interfaces/static_multicast_filters/topology.png[Static multicast filters topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/infix_interfaces/static_multicast_filters/topology.png[Static multicast filters topology]
-
+image::static_multicast_filters/topology.png[Static multicast filters topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Static multicast filters topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/infix_interfaces/vlan_qos/Readme.adoc b/test/case/infix_interfaces/vlan_qos/Readme.adoc
index a56b220a..9ccb4cb0 100644
--- a/test/case/infix_interfaces/vlan_qos/Readme.adoc
+++ b/test/case/infix_interfaces/vlan_qos/Readme.adoc
@@ -5,17 +5,14 @@ is handled correctly
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/infix_interfaces/vlan_qos/topology.png[VLAN QoS topology]
-
+image::../../test/case/infix_interfaces/vlan_qos/topology.png[VLAN QoS topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/infix_interfaces/vlan_qos/topology.png[VLAN QoS topology]
-
+image::vlan_qos/topology.png[VLAN QoS topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[VLAN QoS topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/infix_services/services_basic/Readme.adoc b/test/case/infix_services/services_basic/Readme.adoc
index 4ba003f9..20e6b213 100644
--- a/test/case/infix_services/services_basic/Readme.adoc
+++ b/test/case/infix_services/services_basic/Readme.adoc
@@ -10,17 +10,14 @@ echo -ne '\x01\x80\xc2\x00\x00\x0e\x01\x80\xc2\x00\x00\x0e\x88\xcc\x02\x07\x04\x
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/infix_services/services_basic/topology.png[Services basic topology]
-
+image::../../test/case/infix_services/services_basic/topology.png[Services basic topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/infix_services/services_basic/topology.png[Services basic topology]
-
+image::services_basic/topology.png[Services basic topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Services basic topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/misc/operational_all/Readme.adoc b/test/case/misc/operational_all/Readme.adoc
index 2f945887..4276569b 100644
--- a/test/case/misc/operational_all/Readme.adoc
+++ b/test/case/misc/operational_all/Readme.adoc
@@ -4,17 +4,14 @@ Basic test just to get all operational.
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/misc/operational_all/topology.png[Get all operational topology]
-
+image::../../test/case/misc/operational_all/topology.png[Get all operational topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/misc/operational_all/topology.png[Get all operational topology]
-
+image::operational_all/topology.png[Get all operational topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Get all operational topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/case/misc/start_from_startup/Readme.adoc b/test/case/misc/start_from_startup/Readme.adoc
index 7a3a7072..15f0801f 100644
--- a/test/case/misc/start_from_startup/Readme.adoc
+++ b/test/case/misc/start_from_startup/Readme.adoc
@@ -4,17 +4,14 @@ Undefined
 
 ==== Topology
 ifdef::topdoc[]
-image::/home/lazzer/Documents/addiva/infix/test/case/misc/start_from_startup/topology.png[Undefined topology]
-
+image::../../test/case/misc/start_from_startup/topology.png[Undefined topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
-image::lazzer/Documents/addiva/infix/test/case/misc/start_from_startup/topology.png[Undefined topology]
-
+image::start_from_startup/topology.png[Undefined topology]
 endif::testgroup[]
 ifndef::testgroup[]
 image::topology.png[Undefined topology]
-
 endif::testgroup[]
 endif::topdoc[]
 ==== Test sequence
diff --git a/test/spec/generate_spec.py b/test/spec/generate_spec.py
index 523ca1c2..946d8065 100755
--- a/test/spec/generate_spec.py
+++ b/test/spec/generate_spec.py
@@ -41,8 +41,11 @@ def visit_Call(self, node):
         self.generic_visit(node)  # Continue visiting other nodes
 
 class TestCase:
-    def __init__(self, directory):
-        self.root=Path(directory)
+    def __init__(self, directory, rootdir=None):
+        self.test_dir=Path(directory)
+        if rootdir:
+            rootdir=Path(f"{rootdir}")
+            self.test_dir=self.test_dir.relative_to(rootdir)
         self.topology_dot=f"{directory}/topology.dot"
         self.topology_image=f"{directory}/topology"
         self.test_case=f"{directory}/test.py"
@@ -59,7 +62,6 @@ def __init__(self, directory):
     def generate_topology(self):
         with open(self.topology_dot, 'r') as dot_file:
             dot_graph = dot_file.read()
-            # Create a Graph object
             graph = graphviz.Source(dot_graph)
             graph.render(self.topology_image, format='png', cleanup=True)
 
@@ -71,19 +73,16 @@ def generate_specification(self):
             spec.write(self.description + "\n\n")
             spec.write("==== Topology\n")
             spec.write("ifdef::topdoc[]\n")
-            spec.write(f"image::{self.root}/topology.png[{self.name} topology]\n\n")
+            spec.write(f"image::../../{self.test_dir}/topology.png[{self.name} topology]\n")
             spec.write("endif::topdoc[]\n")
-
             spec.write("ifndef::topdoc[]\n")
             spec.write("ifdef::testgroup[]\n")
-            spec.write(f"image::{Path(*self.root.parts[2:])}/topology.png[{self.name} topology]\n\n")
+            spec.write(f"image::{Path(*self.test_dir.parts[3:])}/topology.png[{self.name} topology]\n")
             spec.write("endif::testgroup[]\n")
-
             spec.write("ifndef::testgroup[]\n")
-            spec.write(f"image::topology.png[{self.name} topology]\n\n")
+            spec.write(f"image::topology.png[{self.name} topology]\n")
             spec.write("endif::testgroup[]\n")
             spec.write("endif::topdoc[]\n")
-            #spec.write(f"image::topology.png[{self.name}]\n\n")
             spec.write("==== Test sequence\n")
             spec.writelines([f". {step}\n" for step in self.test_steps])
             spec.write("\n\n<<<\n\n") # need empty lines to pagebreak
@@ -108,9 +107,10 @@ def parse_directory_tree(directory):
 
 parser = argparse.ArgumentParser(description="Generate a test specification for a subtree.")
 parser.add_argument("-d", "--directory", required=True, help="The directory to parse.")
+parser.add_argument("-r", "--root-dir", help="Path that all paths should be relative to")
 args=parser.parse_args()
 
 directories=parse_directory_tree(args.directory)
 for directory in directories:
-    test_case=TestCase(directory)
+    test_case=TestCase(directory, args.root_dir)
     test_case.generate_specification()
diff --git a/test/test.mk b/test/test.mk
index e93d6b68..07419f34 100644
--- a/test/test.mk
+++ b/test/test.mk
@@ -35,7 +35,7 @@ test-sh:
 
 test-spec:
 	@sed 's/{REPLACE}/$(subst ",,$(INFIX_NAME))/'  $(spec-dir)/Readme.adoc.in > $(spec-dir)/Readme.adoc
-	@$(spec-dir)/generate_spec.py -d $(test-dir)/case
+	@$(spec-dir)/generate_spec.py -d $(test-dir)/case -r $(BR2_EXTERNAL_INFIX_PATH)
 	@asciidoctor-pdf --theme $(spec-dir)/theme.yml -a pdf-fontsdir=$(spec-dir)/fonts -o $(test-specification) $(spec-dir)/Readme.adoc
 
 # Unit tests run with random (-r) hostname and container name to