diff --git a/src/corelib/io/qstorageinfo_unix.cpp b/src/corelib/io/qstorageinfo_unix.cpp
index bbcc29c50b0a0c626b39bb2b4739361a7d4a4a10..bf998993d8a1282b07459f63a59cfb56ac87b2a8 100644
--- a/src/corelib/io/qstorageinfo_unix.cpp
+++ b/src/corelib/io/qstorageinfo_unix.cpp
@@ -160,12 +160,15 @@ static bool isPseudoFs(const QStorageIterator &it)
 
     QByteArray type = it.fileSystemType();
     if (type == "tmpfs")
-        return true;
+        return false;
 #if defined(Q_OS_LINUX)
     if (type == "rootfs" || type == "rpc_pipefs")
         return true;
 #endif
 
+    if (!it.device().startsWith('/'))
+        return true;
+
     return false;
 }
 
diff --git a/tests/manual/qstorageinfo/main.cpp b/tests/manual/qstorageinfo/main.cpp
index 884e5559ce4dae5c3b88ebe0a55bd8c8e134b0c7..5c106ff45b41a04bc9fc584a8372df1f11acbf96 100644
--- a/tests/manual/qstorageinfo/main.cpp
+++ b/tests/manual/qstorageinfo/main.cpp
@@ -66,10 +66,11 @@ int main(int argc, char *argv[])
 
     printf("Filesystem (Type)            Size  Available BSize  Label            Mounted on\n");
     foreach (const QStorageInfo &info, volumes) {
-        const QString fsAndType = info.device() + QLatin1String(" (") +
-                                  info.fileSystemType() + QLatin1Char(')');
+        QByteArray fsAndType = info.device();
+        if (info.fileSystemType() != fsAndType)
+            fsAndType += " (" + info.fileSystemType() + ')';
 
-        printf("%-19s R%c ", qPrintable(fsAndType), info.isReadOnly() ? 'O' : 'W');
+        printf("%-19s R%c ", fsAndType.constData(), info.isReadOnly() ? 'O' : 'W');
         if (fsAndType.size() > 19)
             printf("\n%23s", "");