diff --git a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/01-start-scst.t b/scstadmin/scstadmin.sysfs/scst-1.0.0/t/01-start-scst.t
index e7ebc9b4d..34bf666bb 100644
--- a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/01-start-scst.t
+++ b/scstadmin/scstadmin.sysfs/scst-1.0.0/t/01-start-scst.t
@@ -25,7 +25,6 @@ if ($> == 0) {
     ok(system("modprobe scst_local add_default_tgt=0 && " .
 	      "modprobe iscsi-scst && " .
 	      "modprobe ib_srpt && " .
-	      "modprobe qla2x00tgt && " .
 	      "modprobe scst_vdisk && " .
-	      "iscsi-scstd"), 0);
+	      "../../../iscsi-scst/usr/iscsi-scstd"), 0);
 }
diff --git a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-result.conf b/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-result.conf
index 8bee55a95..b650ac13b 100644
--- a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-result.conf
+++ b/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-result.conf
@@ -14,9 +14,7 @@ HANDLER vdisk_fileio {
 }
 
 HANDLER vdisk_nullio {
-	DEVICE nodev {
-		dummy 1
-	}
+	DEVICE nodev
 }
 
 TARGET_DRIVER scst_local {
diff --git a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-scstadmin-args.t b/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-scstadmin-args.t
index 58e149049..754fd7d1f 100644
--- a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-scstadmin-args.t
+++ b/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-scstadmin-args.t
@@ -68,7 +68,8 @@ sub attributeTest {
     system("$scstadmin -driver scst_local -target local -group ig " .
 	   "-add_lun 1 -device disk1 $redirect");
     system("$scstadmin -write_config $tmpfilename1 >/dev/null");
-    system("awk 'BEGIN { t = 0 } /^# Automatically generated by SCST Configurator v/ { \$0 = \"# Automatically generated by SCST Configurator v...\" } /^TARGET_DRIVER.*{\$/ { if (\$0 != \"TARGET_DRIVER scst_local {\") t = 1 } /^}\$/ { if (t == 1) t = 2 } /^\$/ { if (t == 2) { t = 3 } } /^./ { if (t == 3) { t = 0 } } { if (t == 0) print }' <$tmpfilename1 >$tmpfilename2");
+    # Keep only the scst_local target driver information.
+    system("awk 'BEGIN { t = 0 } /^# Automatically generated by SCST Configurator v/ { \$0 = \"# Automatically generated by SCST Configurator v...\" } /^TARGET_DRIVER.*{\$/ { if (match(\$0, \"TARGET_DRIVER ([^ ]*) {\", d) && d[1] != \"scst_local\") t = 1 } /^}\$/ { if (t == 1) t = 2 } /^\$/ { if (t == 2) { t = 3 } } /^./ { if (t == 3) { t = 0 } } { if (t == 0) print }' <$tmpfilename1 >$tmpfilename2");
     my $compare_result = system("diff -u $tmpfilename2 $expected >$diff");
     ok($compare_result, 0);
     if ($compare_result == 0) {