diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-invariant-select-bug.ll b/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-invariant-select-bug.ll
deleted file mode 100644
index 4097d3523ab30b..00000000000000
--- a/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-invariant-select-bug.ll
+++ /dev/null
@@ -1,32 +0,0 @@
-; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -passes='simple-loop-unswitch<nontrivial>' -S < %s | FileCheck %s
-
-; If we try to replace uses of `true` outside of `@foo`, we'll see it here.
-define i1 @bar() {
-; CHECK-LABEL: @bar(
-; CHECK-NEXT:    ret i1 true
-;
-  ret i1 true
-}
-
-; We shouldn't unswitch this loop.
-define void @foo() {
-; CHECK-LABEL: @foo(
-; CHECK-NEXT:  entry:
-; CHECK-NEXT:    br label [[HEADER:%.*]]
-; CHECK:       header:
-; CHECK-NEXT:    [[VAL:%.*]] = select i1 true, i1 true, i1 false
-; CHECK-NEXT:    br i1 true, label [[EXIT:%.*]], label [[HEADER]]
-; CHECK:       exit:
-; CHECK-NEXT:    ret void
-;
-entry:
-  br label %header
-
-header:
-  %val = select i1 true, i1 true, i1 false
-  br i1 %val, label %exit, label %header
-
-exit:
-  ret void
-}
diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-trivial-select.ll b/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-trivial-select.ll
new file mode 100644
index 00000000000000..c9f22b4960e92f
--- /dev/null
+++ b/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-trivial-select.ll
@@ -0,0 +1,84 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
+; RUN: opt -passes='simple-loop-unswitch<nontrivial>' -S < %s | FileCheck %s
+
+; If we try to replace uses of `true` outside of `@foo`, we'll see it here.
+define i1 @bar() {
+; CHECK-LABEL: @bar(
+; CHECK-NEXT:    ret i1 true
+;
+  ret i1 true
+}
+
+; We shouldn't unswitch this loop.
+define void @foo() {
+; CHECK-LABEL: @foo(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    br label [[HEADER:%.*]]
+; CHECK:       header:
+; CHECK-NEXT:    [[VAL:%.*]] = select i1 true, i1 true, i1 false
+; CHECK-NEXT:    br i1 true, label [[EXIT:%.*]], label [[HEADER]]
+; CHECK:       exit:
+; CHECK-NEXT:    ret void
+;
+entry:
+  br label %header
+
+header:
+  %val = select i1 true, i1 true, i1 false
+  br i1 %val, label %exit, label %header
+
+exit:
+  ret void
+}
+
+define void @unswitch_trivial_select(i1 %c.1, i1 %c.2, i8 %a) {
+; CHECK-LABEL: @unswitch_trivial_select(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    br i1 [[C_1:%.*]], label [[PH_1:%.*]], label [[EXIT:%.*]]
+; CHECK:       ph.1:
+; CHECK-NEXT:    br i1 [[C_2:%.*]], label [[PH_2:%.*]], label [[EXIT]]
+; CHECK:       ph.2:
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i8 [[A:%.*]], 30
+; CHECK-NEXT:    [[SEL:%.*]] = select i1 [[CMP]], i1 true, i1 false
+; CHECK-NEXT:    [[CMP_FR:%.*]] = freeze i1 [[CMP]]
+; CHECK-NEXT:    br i1 [[CMP_FR]], label [[PH_2_SPLIT_US:%.*]], label [[PH_2_SPLIT:%.*]]
+; CHECK:       ph.2.split.us:
+; CHECK-NEXT:    br label [[LOOP_US:%.*]]
+; CHECK:       loop.us:
+; CHECK-NEXT:    call void @foo()
+; CHECK-NEXT:    br label [[EXIT_LOOPEXIT_SPLIT_US:%.*]]
+; CHECK:       exit.loopexit.split.us:
+; CHECK-NEXT:    br label [[EXIT_LOOPEXIT:%.*]]
+; CHECK:       ph.2.split:
+; CHECK-NEXT:    br label [[LOOP:%.*]]
+; CHECK:       loop:
+; CHECK-NEXT:    call void @foo()
+; CHECK-NEXT:    br label [[LOOP_LATCH:%.*]]
+; CHECK:       loop.latch:
+; CHECK-NEXT:    br label [[LOOP]]
+; CHECK:       exit.loopexit:
+; CHECK-NEXT:    br label [[EXIT]]
+; CHECK:       exit:
+; CHECK-NEXT:    ret void
+;
+entry:
+  br i1 %c.1, label %ph.1, label %exit
+
+ph.1:
+  br i1 %c.2, label %ph.2, label %exit
+
+ph.2:
+  %cmp = icmp eq i8 %a, 30
+  %sel = select i1 %cmp, i1 true, i1 false
+  br label %loop
+
+loop:
+  call void @foo()
+  br i1 %sel, label %exit, label %loop.latch
+
+loop.latch:
+  br label %loop
+
+exit:
+  ret void
+}