diff --git a/mysql-test/lib/My/SysInfo.pm b/mysql-test/lib/My/SysInfo.pm
index 1e5ac353def..211f72c0561 100644
--- a/mysql-test/lib/My/SysInfo.pm
+++ b/mysql-test/lib/My/SysInfo.pm
@@ -68,7 +68,7 @@ sub _cpuinfo {
     }
   }
   $F= undef; # Close file
-  return $self;
+  return $self->{cpus};
 }
 
 
@@ -95,12 +95,7 @@ sub _kstat {
     push(@{$self->{cpus}}, $cpuinfo);
   }
 
-  # At least one cpu should have been found
-  # if this method worked
-  if ( $self->{cpus} ) {
-    return $self;
-  }
-  return undef;
+  return $self->{cpus};
 }