diff --git a/llvm/unittests/ADT/CMakeLists.txt b/llvm/unittests/ADT/CMakeLists.txt
--- a/llvm/unittests/ADT/CMakeLists.txt
+++ b/llvm/unittests/ADT/CMakeLists.txt
@@ -39,7 +39,6 @@
   IntervalMapTest.cpp
   IntrusiveRefCntPtrTest.cpp
   IteratorTest.cpp
-  MakeUniqueTest.cpp
   MappedIteratorTest.cpp
   MapVectorTest.cpp
   OptionalTest.cpp
diff --git a/llvm/unittests/ADT/FunctionRefTest.cpp b/llvm/unittests/ADT/FunctionRefTest.cpp
--- a/llvm/unittests/ADT/FunctionRefTest.cpp
+++ b/llvm/unittests/ADT/FunctionRefTest.cpp
@@ -1,4 +1,4 @@
-//===- llvm/unittest/ADT/MakeUniqueTest.cpp - std::make_unique unit tests ------===//
+//===- llvm/unittest/ADT/FunctionRefTest.cpp - function_ref unit tests ----===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/llvm/unittests/ADT/MakeUniqueTest.cpp b/llvm/unittests/ADT/MakeUniqueTest.cpp
deleted file mode 100644
--- a/llvm/unittests/ADT/MakeUniqueTest.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//===- llvm/unittest/ADT/MakeUniqueTest.cpp - std::make_unique unit tests ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/STLExtras.h"
-#include "gtest/gtest.h"
-#include <tuple>
-using namespace llvm;
-
-namespace {
-
-TEST(MakeUniqueTest, SingleObject) {
-  auto p0 = std::make_unique<int>();
-  EXPECT_TRUE((bool)p0);
-  EXPECT_EQ(0, *p0);
-
-  auto p1 = std::make_unique<int>(5);
-  EXPECT_TRUE((bool)p1);
-  EXPECT_EQ(5, *p1);
-
-  auto p2 = std::make_unique<std::tuple<int, int>>(0, 1);
-  EXPECT_TRUE((bool)p2);
-  EXPECT_EQ(std::make_tuple(0, 1), *p2);
-
-  auto p3 = std::make_unique<std::tuple<int, int, int>>(0, 1, 2);
-  EXPECT_TRUE((bool)p3);
-  EXPECT_EQ(std::make_tuple(0, 1, 2), *p3);
-
-  auto p4 = std::make_unique<std::tuple<int, int, int, int>>(0, 1, 2, 3);
-  EXPECT_TRUE((bool)p4);
-  EXPECT_EQ(std::make_tuple(0, 1, 2, 3), *p4);
-
-  auto p5 = std::make_unique<std::tuple<int, int, int, int, int>>(0, 1, 2, 3, 4);
-  EXPECT_TRUE((bool)p5);
-  EXPECT_EQ(std::make_tuple(0, 1, 2, 3, 4), *p5);
-
-  auto p6 =
-      std::make_unique<std::tuple<int, int, int, int, int, int>>(0, 1, 2, 3, 4, 5);
-  EXPECT_TRUE((bool)p6);
-  EXPECT_EQ(std::make_tuple(0, 1, 2, 3, 4, 5), *p6);
-
-  auto p7 = std::make_unique<std::tuple<int, int, int, int, int, int, int>>(
-      0, 1, 2, 3, 4, 5, 6);
-  EXPECT_TRUE((bool)p7);
-  EXPECT_EQ(std::make_tuple(0, 1, 2, 3, 4, 5, 6), *p7);
-
-  auto p8 = std::make_unique<std::tuple<int, int, int, int, int, int, int, int>>(
-      0, 1, 2, 3, 4, 5, 6, 7);
-  EXPECT_TRUE((bool)p8);
-  EXPECT_EQ(std::make_tuple(0, 1, 2, 3, 4, 5, 6, 7), *p8);
-
-  auto p9 =
-      std::make_unique<std::tuple<int, int, int, int, int, int, int, int, int>>(
-          0, 1, 2, 3, 4, 5, 6, 7, 8);
-  EXPECT_TRUE((bool)p9);
-  EXPECT_EQ(std::make_tuple(0, 1, 2, 3, 4, 5, 6, 7, 8), *p9);
-
-  auto p10 =
-      std::make_unique<std::tuple<int, int, int, int, int, int, int, int, int, int>>(
-          0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
-  EXPECT_TRUE((bool)p10);
-  EXPECT_EQ(std::make_tuple(0, 1, 2, 3, 4, 5, 6, 7, 8, 9), *p10);
-}
-
-TEST(MakeUniqueTest, Array) {
-  auto p1 = std::make_unique<int[]>(2);
-  EXPECT_TRUE((bool)p1);
-  EXPECT_EQ(0, p1[0]);
-  EXPECT_EQ(0, p1[1]);
-}
-}