diff --git a/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm b/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm
index 6bef8619b..5fca60f2e 100644
--- a/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm
+++ b/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm
@@ -929,7 +929,7 @@ sub driverExists {
 	    opendir($dHandle, make_path(SCST_TARGETS_DIR(), $driver));
 	close $dHandle if ($result);
 
-	return $result;
+	return $result ? TRUE : FALSE;
 }
 
 sub driverDynamicAttributes {
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 352481b90..58e149049 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
@@ -7,17 +7,16 @@ use File::Spec;
 use Test;
 
 my $testdir;
-my $scstadmin_pm_dir;
-my $scstadmin_dir;
 my $scstadmin;
-my $redirect_file = "/tmp/07-output.txt";
+my $redirect_file;
 my $redirect;
 
 BEGIN {
+    $redirect_file = "/tmp/07-output.txt";
     unlink($redirect_file);
     $testdir = dirname(abs_path($0));
-    $scstadmin_pm_dir = dirname($testdir);
-    $scstadmin_dir = dirname($scstadmin_pm_dir);
+    my $scstadmin_pm_dir = dirname($testdir);
+    my $scstadmin_dir = dirname($scstadmin_pm_dir);
     $scstadmin = File::Spec->catfile($scstadmin_dir, "scstadmin");
     unless(grep /blib/, @INC) {
 	unshift(@INC, File::Spec->catdir($scstadmin_pm_dir, "lib"));