diff --git a/gcc/testsuite/gcc.dg/vect/vect-uncounted_7.c b/gcc/testsuite/gcc.dg/vect/vect-uncounted_7.c
index 83aa3085ce7..d299c7fa433 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-uncounted_7.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-uncounted_7.c
@@ -20,5 +20,5 @@ void foo(int i, char *p, char *q)
   }
 }
 
-/* { dg-final { scan-tree-dump "Loop being analyzed as uncounted." "vect" } } */
-/* { dg-final { scan-tree-dump "vectorized 1 loops in function" "vect" } } */
+/* { dg-final { scan-tree-dump "Loop being analyzed as uncounted." "vect"  } } */
+/* { dg-final { scan-tree-dump "vectorized 1 loops in function" "vect" { xfail *-*-* } } } */
diff --git a/gcc/tree-cfgcleanup.cc b/gcc/tree-cfgcleanup.cc
index 929990cef2e..4cf754f5e56 100644
--- a/gcc/tree-cfgcleanup.cc
+++ b/gcc/tree-cfgcleanup.cc
@@ -629,10 +629,8 @@ maybe_remove_forwarder_block (basic_block bb, bool can_split = false)
 		return false;
 	      /* If bb doesn't have a single predecessor we'd make this
 		 loop have multiple latches.  Don't do that if that
-		 would in turn require disambiguating them.  */
-	      if (!single_pred_p (bb)
-		      && !loops_state_satisfies_p
-			   (LOOPS_MAY_HAVE_MULTIPLE_LATCHES))
+		 would in turn require disambiguating them over again.  */
+	      if (!single_pred_p (bb))
 		return false;
 	    }
 	  /* cleanup_tree_cfg_noloop just created the loop preheader, don't