diff --git a/tests/_support_server.pm b/tests/_support_server.pm
index e752b6ed..d76006c1 100644
--- a/tests/_support_server.pm
+++ b/tests/_support_server.pm
@@ -116,11 +116,15 @@ sub run {
     ## ISCSI
 
     # start up iscsi target
-    assert_script_run "printf '<target iqn.2016-06.local.domain:support.target1>\n    backing-store /dev/vdb\n    incominguser test weakpassword\n</target>' > /etc/tgt/conf.d/openqa.conf";
+    #assert_script_run "printf '<target iqn.2016-06.local.domain:support.target1>\n    backing-store /dev/vdb\n    incominguser test weakpassword\n</target>' > /etc/tgt/conf.d/openqa.conf";
+    assert_script_run "targetcli /backstores/block create dev=/dev/vdb name=vdb";
+    assert_script_run "targetcli /iscsi create wwn=iqn.2016-06.local.domain:support.target1";
+    assert_script_run "targetcli /iscsi/iqn.2016-06.local.domain:support.target1/tpg1 set auth userid=test password=weakpassword";
+    assert_script_run "targetcli /iscsi/iqn.2016-06.local.domain:support.target1/tpg1/luns create /backstores/block/vdb";
     # open firewall port
-    assert_script_run "firewall-cmd --add-service=iscsi-target";
-    assert_script_run "systemctl restart tgtd.service";
-    assert_script_run "systemctl is-active tgtd.service";
+    assert_script_run "firewall-cmd --add-port=3260/tcp";
+    assert_script_run "systemctl restart target.service";
+    assert_script_run "systemctl is-active target.service";
 
     ## NFS