diff --git a/tests/run_test.pl b/tests/run_test.pl
index a496a92ece..755e1bcaef 100755
--- a/tests/run_test.pl
+++ b/tests/run_test.pl
@@ -87,6 +87,12 @@ my $status = Getopt::Long::GetOptions(
     'suite=s'       => \$o_suite,
 );
 
+# Auto detect cygwin mess
+if (-e "/cydrive") {
+    print "Info: CYGWIN OS detected. Update path accordingly\n";
+    $o_cygwin = 1;
+}
+
 #####################################################
 # Check option
 #####################################################
@@ -126,11 +132,6 @@ unless (-d $o_cfg) {
     help();
 }
 
-#if (`uname -a` =~ /cygwin/) {
-#    print "Info: CYGWIN env detected\n";
-#    $o_cygwin = 1;
-#}
-
 my %blacklist;
 if (defined $o_regression) {
     # Blacklist bad test