diff --git a/llvm/test/Transforms/InstCombine/AArch64/sve-bitcast-inseltpoison.ll b/llvm/test/Transforms/InstCombine/scalable-bitcast-inseltpoison.ll
rename from llvm/test/Transforms/InstCombine/AArch64/sve-bitcast-inseltpoison.ll
rename to llvm/test/Transforms/InstCombine/scalable-bitcast-inseltpoison.ll
--- a/llvm/test/Transforms/InstCombine/AArch64/sve-bitcast-inseltpoison.ll
+++ b/llvm/test/Transforms/InstCombine/scalable-bitcast-inseltpoison.ll
@@ -1,4 +1,4 @@
-; RUN: opt -instcombine -mtriple=aarch64-linux-gnu -mattr=+sve -S < %s | FileCheck %s
+; RUN: opt -instcombine -S < %s | FileCheck %s
 
 ; We shouldn't fold bitcast(insert <vscale x 1 x iX> .., iX %val, i32 0)
 ; into bitcast(iX %val) for scalable vectors.
diff --git a/llvm/test/Transforms/InstCombine/AArch64/sve-bitcast.ll b/llvm/test/Transforms/InstCombine/scalable-bitcast.ll
rename from llvm/test/Transforms/InstCombine/AArch64/sve-bitcast.ll
rename to llvm/test/Transforms/InstCombine/scalable-bitcast.ll
--- a/llvm/test/Transforms/InstCombine/AArch64/sve-bitcast.ll
+++ b/llvm/test/Transforms/InstCombine/scalable-bitcast.ll
@@ -1,4 +1,4 @@
-; RUN: opt -instcombine -mtriple=aarch64-linux-gnu -mattr=+sve -S < %s | FileCheck %s
+; RUN: opt -instcombine -S < %s | FileCheck %s
 
 ; We shouldn't fold bitcast(insert <vscale x 1 x iX> .., iX %val, i32 0)
 ; into bitcast(iX %val) for scalable vectors.
diff --git a/llvm/test/Transforms/InstCombine/AArch64/sve-cast-of-alloc.ll b/llvm/test/Transforms/InstCombine/scalable-cast-of-alloc.ll
rename from llvm/test/Transforms/InstCombine/AArch64/sve-cast-of-alloc.ll
rename to llvm/test/Transforms/InstCombine/scalable-cast-of-alloc.ll
--- a/llvm/test/Transforms/InstCombine/AArch64/sve-cast-of-alloc.ll
+++ b/llvm/test/Transforms/InstCombine/scalable-cast-of-alloc.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -instcombine -mtriple aarch64-linux-gnu -mattr=+sve -S < %s 2>%t | FileCheck %s
+; RUN: opt -instcombine -S < %s 2>%t | FileCheck %s
 ; RUN: FileCheck --check-prefix=WARN --allow-empty %s <%t
 
 ; If this check fails please read test/CodeGen/AArch64/README for instructions on how to resolve it.
diff --git a/llvm/test/Transforms/InstCombine/AArch64/sve-const-fp-splat.ll b/llvm/test/Transforms/InstCombine/scalable-const-fp-splat.ll
rename from llvm/test/Transforms/InstCombine/AArch64/sve-const-fp-splat.ll
rename to llvm/test/Transforms/InstCombine/scalable-const-fp-splat.ll
--- a/llvm/test/Transforms/InstCombine/AArch64/sve-const-fp-splat.ll
+++ b/llvm/test/Transforms/InstCombine/scalable-const-fp-splat.ll
@@ -1,4 +1,4 @@
-; RUN: opt -instcombine -mtriple aarch64-linux-gnu -mattr=+sve -S -o - < %s 2>%t | FileCheck %s
+; RUN: opt -instcombine -S -o - < %s 2>%t | FileCheck %s
 ; RUN: FileCheck --check-prefix=WARN --allow-empty %s <%t
 
 ; If this check fails please read test/CodeGen/AArch64/README for instructions on how to resolve it.
diff --git a/llvm/test/Transforms/InstCombine/AArch64/sve-trunc.ll b/llvm/test/Transforms/InstCombine/scalable-trunc.ll
rename from llvm/test/Transforms/InstCombine/AArch64/sve-trunc.ll
rename to llvm/test/Transforms/InstCombine/scalable-trunc.ll
--- a/llvm/test/Transforms/InstCombine/AArch64/sve-trunc.ll
+++ b/llvm/test/Transforms/InstCombine/scalable-trunc.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -mtriple aarch64-linux-gnu -mattr=+sve -instcombine -S < %s 2>%t | FileCheck %s
+; RUN: opt -instcombine -S < %s 2>%t | FileCheck %s
 ; RUN: FileCheck --check-prefix=WARN --allow-empty %s <%t
 
 ; If this check fails please read test/CodeGen/AArch64/README for instructions on how to resolve it.