diff --git a/tests/gen.pl b/tests/gen.pl
index fc88970..ef25c00 100755
--- a/tests/gen.pl
+++ b/tests/gen.pl
@@ -27,7 +27,7 @@ foreach my $n (@a)
 {
 	my @data = split(/-/, $n);
 	printf(
-		'["%s", "deb/%s-amd64", "%s", [%s]],' . "\n",
+		'["%s", "debian/%s64", "%s", [%s]],' . "\n",
 		$n,
 		$data[0],
 		long2ip($iip),
diff --git a/tests/host_vars/jessie-default-mariadb-slave b/tests/host_vars/jessie-default-mariadb-slave
index fab920a..812a255 100644
--- a/tests/host_vars/jessie-default-mariadb-slave
+++ b/tests/host_vars/jessie-default-mariadb-slave
@@ -1 +1 @@
-his_master: '192.168.200.22'
+his_master: '192.168.200.16'
diff --git a/tests/host_vars/jessie-default-mysql-slave b/tests/host_vars/jessie-default-mysql-slave
index 812a255..b9a7abf 100644
--- a/tests/host_vars/jessie-default-mysql-slave
+++ b/tests/host_vars/jessie-default-mysql-slave
@@ -1 +1 @@
-his_master: '192.168.200.16'
+his_master: '192.168.200.10'
diff --git a/tests/host_vars/jessie-upstream-mariadb-slave b/tests/host_vars/jessie-upstream-mariadb-slave
index 0dc0978..5a0ff93 100644
--- a/tests/host_vars/jessie-upstream-mariadb-slave
+++ b/tests/host_vars/jessie-upstream-mariadb-slave
@@ -1 +1 @@
-his_master: '192.168.200.18'
+his_master: '192.168.200.12'
diff --git a/tests/host_vars/jessie-upstream-percona-slave b/tests/host_vars/jessie-upstream-percona-slave
index db8abd8..ed31632 100644
--- a/tests/host_vars/jessie-upstream-percona-slave
+++ b/tests/host_vars/jessie-upstream-percona-slave
@@ -1 +1 @@
-his_master: '192.168.200.20'
+his_master: '192.168.200.14'