diff --git a/test/Object/archive-format.test b/test/Object/archive-format.test
new file mode 100644
index 00000000000..5537175f9c9
--- /dev/null
+++ b/test/Object/archive-format.test
@@ -0,0 +1,22 @@
+Test the exact archive format. In particular, test which file names use the
+string table or not.
+
+REQUIRES: shell
+
+RUN: mkdir -p %t
+RUN: cd %t
+
+RUN: echo bar > 0123456789abcde
+RUN: echo zed > 0123456789abcdef
+
+RUN: rm -f test.a
+RUN: llvm-ar rc test.a 0123456789abcde 0123456789abcdef
+RUN: cat test.a | FileCheck -strict-whitespace %s
+
+CHECK:      !<arch>
+CHECK-NEXT: //                                              18        `
+CHECK-NEXT: 0123456789abcdef/
+CHECK-NEXT: 0123456789abcde/{{.*}}  {{.*}}  {{.*}}  {{.*}}  4         `
+CHECK-NEXT: bar
+CHECK-NEXT: /0              {{.*}}  {{.*}}  {{.*}}  {{.*}}  4         `
+CHECK-NEXT: zed
diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp
index ab2a2f18ec5..5f47654b246 100644
--- a/tools/llvm-ar/llvm-ar.cpp
+++ b/tools/llvm-ar/llvm-ar.cpp
@@ -419,7 +419,7 @@ StringRef NewArchiveIterator::getNew() const {
 template <typename T>
 void addMember(std::vector<NewArchiveIterator> &Members,
                std::string &StringTable, T I, StringRef Name) {
-  if (Name.size() < 15) {
+  if (Name.size() < 16) {
     NewArchiveIterator NI(I, Twine(Name) + "/");
     Members.push_back(NI);
   } else {