Index: lib/Driver/UniversalDriver.cpp
===================================================================
--- lib/Driver/UniversalDriver.cpp
+++ lib/Driver/UniversalDriver.cpp
@@ -91,7 +91,7 @@
       .Case("lld-link", Flavor::win_link)
       .Case("darwin", Flavor::darwin_ld)
       .Case("core", Flavor::core)
-      .Case("ld", Flavor::old_gnu_ld)
+      .Case("ld", Flavor::gnu_ld)
       .Default(Flavor::invalid);
 }
 
@@ -153,7 +153,7 @@
     return Flavor::darwin_ld;
 #endif
     // On a ELF based systems, if linker binary is named "ld", use gnu driver.
-    return Flavor::old_gnu_ld;
+    return Flavor::gnu_ld;
   }
 #endif
 
Index: test/old-elf/linker-as-ld.test
===================================================================
--- test/old-elf/linker-as-ld.test
+++ test/old-elf/linker-as-ld.test
@@ -1,7 +1,7 @@
 REQUIRES: system-linker-elf
 
 RUN: mkdir -p %t.dir && cp `which lld` %t.dir/ld
-RUN: %t.dir/ld -target x86_64-linux -o %t %p/Inputs/relocs.x86-64 \
+RUN: %t.dir/ld -o %t %p/Inputs/relocs.x86-64 \
 RUN:  -e _start -static
 RUN: llvm-readobj -t %t | FileCheck %s
 
Index: unittests/DriverTests/UniversalDriverTest.cpp
===================================================================
--- unittests/DriverTests/UniversalDriverTest.cpp
+++ unittests/DriverTests/UniversalDriverTest.cpp
@@ -21,7 +21,7 @@
 using namespace lld;
 
 TEST(UniversalDriver, flavor) {
-  const char *args[] = {"old-ld"};
+  const char *args[] = {"ld", "-flavor", "old-gnu"};
 
   std::string diags;
   raw_string_ostream os(diags);