diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9a87cfe595bf..5160e86fc9d8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,24 @@
+2020-01-22  Andrew Pinski  <apinski@marvell.com>
+
+	* gcc.dg/tree-ssa/pr88497-1.c: Move to ...
+	* gcc.dg/vect/pr88497-1.c: This.
+	* gcc.dg/tree-ssa/pr88497-2.c: Move to ...
+	* gcc.dg/vect/pr88497-2.c: This.
+	* gcc.dg/tree-ssa/pr88497-3.c: Move to ...
+	* gcc.dg/vect/pr88497-3.c: This.
+	* gcc.dg/tree-ssa/pr88497-4.c: Move to ...
+	* gcc.dg/vect/pr88497-4.c: This.
+	* gcc.dg/tree-ssa/pr88497-5.c: Move to ...
+	* gcc.dg/vect/pr88497-5.c: This.
+	* gcc.dg/tree-ssa/pr88497-6.c: Move to ...
+	* gcc.dg/vect/pr88497-6.c: This.
+	* gcc.dg/tree-ssa/pr88497-7.c: Move to ...
+	* gcc.dg/vect/pr88497-7.c: This.
+
+	Revert:
+	* tree-ssa.exp: Set DEFAULT_VECTCFLAGS and DEFAULT_VECTCFLAGS.
+	Call check_vect_support_and_set_flags also.
+
 2020-01-22  Andrew Pinski  <apinski@marvell.com>
 
 	* tree-ssa.exp: Set DEFAULT_VECTCFLAGS and DEFAULT_VECTCFLAGS.
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/tree-ssa.exp b/gcc/testsuite/gcc.dg/tree-ssa/tree-ssa.exp
index 464fef628f80..7d262ffd0fb5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/tree-ssa.exp
+++ b/gcc/testsuite/gcc.dg/tree-ssa/tree-ssa.exp
@@ -19,17 +19,6 @@
 # Load support procs.
 load_lib gcc-dg.exp
 
-# Set up flags used for tests that don't specify options.
-global DEFAULT_VECTCFLAGS
-set DEFAULT_VECTCFLAGS ""
-
-# Set up a list of effective targets to run vector tests for all supported
-# targets.
-global EFFECTIVE_TARGETS
-set EFFECTIVE_TARGETS ""
-
-check_vect_support_and_set_flags
-
 # If a testcase doesn't have special options, use these.
 global DEFAULT_CFLAGS
 if ![info exists DEFAULT_CFLAGS] then {
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr88497-1.c b/gcc/testsuite/gcc.dg/vect/pr88497-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/tree-ssa/pr88497-1.c
rename to gcc/testsuite/gcc.dg/vect/pr88497-1.c
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr88497-2.c b/gcc/testsuite/gcc.dg/vect/pr88497-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/tree-ssa/pr88497-2.c
rename to gcc/testsuite/gcc.dg/vect/pr88497-2.c
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr88497-3.c b/gcc/testsuite/gcc.dg/vect/pr88497-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/tree-ssa/pr88497-3.c
rename to gcc/testsuite/gcc.dg/vect/pr88497-3.c
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr88497-4.c b/gcc/testsuite/gcc.dg/vect/pr88497-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/tree-ssa/pr88497-4.c
rename to gcc/testsuite/gcc.dg/vect/pr88497-4.c
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr88497-5.c b/gcc/testsuite/gcc.dg/vect/pr88497-5.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/tree-ssa/pr88497-5.c
rename to gcc/testsuite/gcc.dg/vect/pr88497-5.c
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr88497-6.c b/gcc/testsuite/gcc.dg/vect/pr88497-6.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/tree-ssa/pr88497-6.c
rename to gcc/testsuite/gcc.dg/vect/pr88497-6.c
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr88497-7.c b/gcc/testsuite/gcc.dg/vect/pr88497-7.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/tree-ssa/pr88497-7.c
rename to gcc/testsuite/gcc.dg/vect/pr88497-7.c