diff --git a/test/util/BUILD b/test/util/BUILD
index e4eec4ab9..14f9acb2e 100644
--- a/test/util/BUILD
+++ b/test/util/BUILD
@@ -46,6 +46,16 @@ cc_library(
     ],
 )
 
+cc_test(
+    name = "proc_util_test",
+    size = "small",
+    srcs = ["proc_util_test.cc"],
+    deps = [
+        ":proc_util",
+        ":test_util",
+    ],
+)
+
 cc_library(
     name = "cleanup",
     testonly = 1,
diff --git a/test/util/proc_util.cc b/test/util/proc_util.cc
index 72f7e67d0..7ebce0759 100644
--- a/test/util/proc_util.cc
+++ b/test/util/proc_util.cc
@@ -17,6 +17,7 @@
 #include <algorithm>
 #include <vector>
 
+#include "absl/strings/ascii.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
@@ -29,10 +30,15 @@ namespace testing {
 // Parses a single line from /proc/<xxx>/maps.
 PosixErrorOr<ProcMapsEntry> ParseProcMapsLine(absl::string_view line) {
   ProcMapsEntry map_entry = {};
-  std::vector<std::string> parts = absl::StrSplit(line, ' ', absl::SkipEmpty());
 
-  // A size of 5 means there is no file name specified.
-  if (parts.size() != 5 && parts.size() != 6) {
+  // Limit splitting to 6 parts so that if there is a file path and it contains
+  // spaces, the file path is not split.
+  std::vector<std::string> parts =
+      absl::StrSplit(line, absl::MaxSplits(' ', 5), absl::SkipEmpty());
+
+  // parts.size() should be 6 if there is a file name specified, and 5
+  // otherwise.
+  if (parts.size() < 5) {
     return PosixError(EINVAL, absl::StrCat("Invalid line: ", line));
   }
 
@@ -67,8 +73,9 @@ PosixErrorOr<ProcMapsEntry> ParseProcMapsLine(absl::string_view line) {
 
   ASSIGN_OR_RETURN_ERRNO(map_entry.inode, Atoi<int64_t>(parts[4]));
   if (parts.size() == 6) {
-    // A filename is present.
-    map_entry.filename = parts[5];
+    // A filename is present. However, absl::StrSplit retained the whitespace
+    // between the inode number and the filename.
+    map_entry.filename = std::string(absl::StripLeadingAsciiWhitespace(parts[5]));
   }
 
   return map_entry;
diff --git a/test/util/proc_util_test.cc b/test/util/proc_util_test.cc
new file mode 100644
index 000000000..75335415a
--- /dev/null
+++ b/test/util/proc_util_test.cc
@@ -0,0 +1,81 @@
+// Copyright 2018 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "test/util/proc_util.h"
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+#include "test/util/test_util.h"
+
+using ::testing::IsEmpty;
+
+namespace gvisor {
+namespace testing {
+
+namespace {
+
+TEST(ParseProcMapsLineTest, WithoutFilename) {
+  auto entry = ASSERT_NO_ERRNO_AND_VALUE(
+      ParseProcMapsLine("2ab4f00b7000-2ab4f00b9000 r-xp 00000000 00:00 0 "));
+  EXPECT_EQ(entry.start, 0x2ab4f00b7000);
+  EXPECT_EQ(entry.end, 0x2ab4f00b9000);
+  EXPECT_TRUE(entry.readable);
+  EXPECT_FALSE(entry.writable);
+  EXPECT_TRUE(entry.executable);
+  EXPECT_TRUE(entry.priv);
+  EXPECT_EQ(entry.offset, 0);
+  EXPECT_EQ(entry.major, 0);
+  EXPECT_EQ(entry.minor, 0);
+  EXPECT_EQ(entry.inode, 0);
+  EXPECT_THAT(entry.filename, IsEmpty());
+}
+
+TEST(ParseProcMapsLineTest, WithFilename) {
+  auto entry = ASSERT_NO_ERRNO_AND_VALUE(
+      ParseProcMapsLine("00407000-00408000 rw-p 00006000 00:0e 10              "
+                        "                   /bin/cat"));
+  EXPECT_EQ(entry.start, 0x407000);
+  EXPECT_EQ(entry.end, 0x408000);
+  EXPECT_TRUE(entry.readable);
+  EXPECT_TRUE(entry.writable);
+  EXPECT_FALSE(entry.executable);
+  EXPECT_TRUE(entry.priv);
+  EXPECT_EQ(entry.offset, 0x6000);
+  EXPECT_EQ(entry.major, 0);
+  EXPECT_EQ(entry.minor, 0x0e);
+  EXPECT_EQ(entry.inode, 10);
+  EXPECT_EQ(entry.filename, "/bin/cat");
+}
+
+TEST(ParseProcMapsLineTest, WithFilenameContainingSpaces) {
+  auto entry = ASSERT_NO_ERRNO_AND_VALUE(
+      ParseProcMapsLine("7f26b3b12000-7f26b3b13000 rw-s 00000000 00:05 1432484 "
+                        "                   /dev/zero (deleted)"));
+  EXPECT_EQ(entry.start, 0x7f26b3b12000);
+  EXPECT_EQ(entry.end, 0x7f26b3b13000);
+  EXPECT_TRUE(entry.readable);
+  EXPECT_TRUE(entry.writable);
+  EXPECT_FALSE(entry.executable);
+  EXPECT_FALSE(entry.priv);
+  EXPECT_EQ(entry.offset, 0);
+  EXPECT_EQ(entry.major, 0);
+  EXPECT_EQ(entry.minor, 0x05);
+  EXPECT_EQ(entry.inode, 1432484);
+  EXPECT_EQ(entry.filename, "/dev/zero (deleted)");
+}
+
+}  // namespace
+
+}  // namespace testing
+}  // namespace gvisor