diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index 5863ee5351d..40b4e78fb0c 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -2612,6 +2612,6 @@ void os::print_open_file_descriptors(outputStream* st) {
 
   st->print_cr("Open File Descriptors: %d", nfiles);
 #else
-    st->print_cr("Open File Descriptors: unknown");
+  st->print_cr("Open File Descriptors: unknown");
 #endif
 }
\ No newline at end of file
diff --git a/test/jdk/sun/tools/jcmd/TestJcmdSanity.java b/test/jdk/sun/tools/jcmd/TestJcmdSanity.java
index 92f73597ce6..559b6b7d5a4 100644
--- a/test/jdk/sun/tools/jcmd/TestJcmdSanity.java
+++ b/test/jdk/sun/tools/jcmd/TestJcmdSanity.java
@@ -33,7 +33,6 @@ import java.util.List;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.Platform;
-import jdk.test.lib.Utils;
 
 /*
  * @test
@@ -182,5 +181,10 @@ public class TestJcmdSanity {
           output.shouldNotContain("*** Handler was modified!");
           output.shouldNotContain("*** Expected: "); // e.g. *** Expected: javaSignalHandler in ...
         }
+
+        // Should find file descriptor counting on Mac and Linux
+        if (Platform.isLinux() || Platform.isOSX()) {
+            output.shouldMatch("Open File Descriptors: \\d+");
+        }
     }
 }