diff --git a/test/enzyme-indexmanipulations-flip-twist-transform/braid.jl b/test/enzyme-indexmanipulations-flip-twist-transform/braid.jl
new file mode 100644
index 000000000..c845a6e65
--- /dev/null
+++ b/test/enzyme-indexmanipulations-flip-twist-transform/braid.jl
@@ -0,0 +1,33 @@
+using Test, TestExtras
+using TensorKit
+using TensorOperations
+using Enzyme, EnzymeTestUtils
+using Random
+
+spacelist = ad_spacelist(fast_tests)
+eltypes = (Float64, ComplexF64)
+
+is_ci = get(ENV, "CI", "false") == "true"
+Tαs = is_ci ? (Active,) : (Active, Const)
+Tβs = is_ci ? (Active,) : (Active, Const)
+
+@timedtestset "Enzyme - Index Manipulations (braid!) $(TensorKit.type_repr(sectortype(eltype(V)))) ($T) Tα $Tα Tβ $Tβ" for V in spacelist, T in eltypes, Tα in Tαs, Tβ in Tβs
+    atol = default_tol(T)
+    rtol = default_tol(T)
+    Vstr = TensorKit.type_repr(sectortype(eltype(V)))
+    has_braiding = BraidingStyle(sectortype(eltype(V))) isa HasBraiding
+    if has_braiding
+        A = randn(T, V[1] ⊗ V[2] ← (V[3] ⊗ V[4] ⊗ V[5])')
+        α = randn(T)
+        β = randn(T)
+        p = randcircshift(numout(A), numin(A))
+        levels = Tuple(randperm(numind(A)))
+        C = randn!(transpose(A, p))
+        EnzymeTestUtils.test_reverse(TensorKit.braid!, Duplicated, (C, Duplicated), (A, Duplicated), (p, Const), (levels, Const), (α, Tα), (β, Tβ); atol, rtol, testset_name = "braid! V $Vstr Tα $Tα Tβ $Tβ")
+        if !(T <: Real) && !is_ci
+            EnzymeTestUtils.test_reverse(TensorKit.braid!, Duplicated, (C, Duplicated), (real(A), Duplicated), (p, Const), (levels, Const), (α, Tα), (β, Tβ); atol, rtol, testset_name = "braid! V $Vstr Tα $Tα Tβ $Tβ")
+            EnzymeTestUtils.test_reverse(TensorKit.braid!, Duplicated, (C, Duplicated), (A, Duplicated), (p, Const), (levels, Const), (real(α), Tα), (β, Tβ); atol, rtol, testset_name = "braid! V $Vstr Tα $Tα Tβ $Tβ")
+            EnzymeTestUtils.test_reverse(TensorKit.braid!, Duplicated, (C, Duplicated), (A, Duplicated), (p, Const), (levels, Const), (real(α), Tα), (real(β), Tβ); atol, rtol, testset_name = "braid! V $Vstr Tα $Tα Tβ $Tβ")
+        end
+    end
+end
diff --git a/test/enzyme-indexmanipulations-flip-twist/flip.jl b/test/enzyme-indexmanipulations-flip-twist-transform/flip.jl
similarity index 100%
rename from test/enzyme-indexmanipulations-flip-twist/flip.jl
rename to test/enzyme-indexmanipulations-flip-twist-transform/flip.jl
diff --git a/test/enzyme-indexmanipulations-flip-twist-transform/permute.jl b/test/enzyme-indexmanipulations-flip-twist-transform/permute.jl
new file mode 100644
index 000000000..28102a3b1
--- /dev/null
+++ b/test/enzyme-indexmanipulations-flip-twist-transform/permute.jl
@@ -0,0 +1,28 @@
+using Test, TestExtras
+using TensorKit
+using TensorOperations
+using Enzyme, EnzymeTestUtils
+using Random
+
+spacelist = ad_spacelist(fast_tests)
+eltypes = (Float64, ComplexF64)
+
+is_ci = get(ENV, "CI", "false") == "true"
+Tαs = is_ci ? (Active,) : (Active, Const)
+Tβs = is_ci ? (Active,) : (Active, Const)
+
+@timedtestset "Enzyme - Index Manipulations (permute!): $(TensorKit.type_repr(sectortype(eltype(V)))) ($T)" for V in spacelist, T in eltypes
+    println(TensorKit.type_repr(sectortype(eltype(V))))
+    atol = default_tol(T)
+    rtol = default_tol(T)
+    symmetricbraiding = BraidingStyle(sectortype(eltype(V))) isa SymmetricBraiding
+
+    symmetricbraiding && @timedtestset "permute! Tα $Tα, Tβ $Tβ" for Tα in Tαs, Tβ in Tβs
+        A = randn(T, V[1] ⊗ V[2] ← (V[3] ⊗ V[4] ⊗ V[5])')
+        α = randn(T)
+        β = randn(T)
+        p = randindextuple(numind(A))
+        C = randn!(permute(A, p))
+        EnzymeTestUtils.test_reverse(TensorKit.permute!, Duplicated, (C, Duplicated), (A, Duplicated), (p, Const), (α, Tα), (β, Tβ); atol, rtol)
+    end
+end
diff --git a/test/enzyme-indexmanipulations-flip-twist-transform/transpose.jl b/test/enzyme-indexmanipulations-flip-twist-transform/transpose.jl
new file mode 100644
index 000000000..9e6703eb1
--- /dev/null
+++ b/test/enzyme-indexmanipulations-flip-twist-transform/transpose.jl
@@ -0,0 +1,35 @@
+using Test, TestExtras
+using TensorKit
+using TensorOperations
+using VectorInterface: Zero, One
+using Enzyme, EnzymeTestUtils
+using Random
+
+spacelist = ad_spacelist(fast_tests)
+eltypes = (Float64, ComplexF64)
+
+is_ci = get(ENV, "CI", "false") == "true"
+
+Tαs = is_ci ? (Active,) : (Active, Const)
+Tβs = is_ci ? (Active,) : (Active, Const)
+
+@timedtestset "Enzyme - Index Manipulations (transpose!) $(TensorKit.type_repr(sectortype(eltype(V)))) ($T)" for V in spacelist, T in eltypes
+    atol = default_tol(T)
+    rtol = default_tol(T)
+    A = randn(T, V[1] ⊗ V[2] ← (V[3] ⊗ V[4] ⊗ V[5])')
+    α = randn(T)
+    β = randn(T)
+
+    # repeat a couple times to get some distribution of arrows
+    p = randcircshift(numout(A), numin(A))
+    C = randn!(transpose(A, p))
+    !is_ci && EnzymeTestUtils.test_reverse(TensorKit.transpose!, Duplicated, (copy(C), Duplicated), (A, Duplicated), (p, Const), (One(), Const), (Zero(), Const); atol, rtol)
+    @testset for Tα in Tαs, Tβ in Tβs
+        EnzymeTestUtils.test_reverse(TensorKit.transpose!, Duplicated, (copy(C), Duplicated), (A, Duplicated), (p, Const), (α, Tα), (β, Tβ); atol, rtol)
+        if !(T <: Real) && !is_ci
+            EnzymeTestUtils.test_reverse(TensorKit.transpose!, Duplicated, (copy(C), Duplicated), (real(A), Duplicated), (p, Const), (α, Tα), (β, Tβ); atol, rtol)
+            EnzymeTestUtils.test_reverse(TensorKit.transpose!, Duplicated, (copy(C), Duplicated), (A, Duplicated), (p, Const), (real(α), Tα), (β, Tβ); atol, rtol)
+            EnzymeTestUtils.test_reverse(TensorKit.transpose!, Duplicated, (copy(C), Duplicated), (real(A), Duplicated), (p, Const), (real(α), Tα), (β, Tβ); atol, rtol)
+        end
+    end
+end
diff --git a/test/enzyme-indexmanipulations-flip-twist-transform/twist.jl b/test/enzyme-indexmanipulations-flip-twist-transform/twist.jl
new file mode 100644
index 000000000..2cacc2b3d
--- /dev/null
+++ b/test/enzyme-indexmanipulations-flip-twist-transform/twist.jl
@@ -0,0 +1,28 @@
+using Test, TestExtras
+using TensorKit
+using TensorOperations
+using VectorInterface: Zero, One
+using Enzyme, EnzymeTestUtils
+using Random
+
+spacelist = ad_spacelist(fast_tests)
+eltypes = (Float64, ComplexF64)
+
+@timedtestset "Enzyme - Index Manipulations (twist):" begin
+    @timedtestset "$(TensorKit.type_repr(sectortype(eltype(V)))) ($T)" for V in spacelist, T in eltypes, TA in (Duplicated,)
+        atol = default_tol(T)
+        rtol = default_tol(T)
+        A = randn(T, V[1] ⊗ V[2] ← (V[3] ⊗ V[4] ⊗ V[5])')
+        has_braiding = BraidingStyle(sectortype(eltype(V))) isa HasBraiding
+        if has_braiding && !(T <: Real && !(sectorscalartype(sectortype(A)) <: Real))
+            EnzymeTestUtils.test_reverse(twist!, TA, (copy(A), TA), (1, Const); atol, rtol, fkwargs = (inv = false,))
+            EnzymeTestUtils.test_reverse(twist!, TA, (copy(A), TA), ([1, 3], Const); atol, rtol, fkwargs = (inv = true,))
+            EnzymeTestUtils.test_reverse(twist!, TA, (copy(A), TA), (1, Const); atol, rtol)
+            EnzymeTestUtils.test_reverse(twist!, TA, (copy(A), TA), ([1, 3], Const); atol, rtol)
+            EnzymeTestUtils.test_forward(twist!, TA, (copy(A), TA), (1, Const); atol, rtol, fkwargs = (inv = false,))
+            EnzymeTestUtils.test_forward(twist!, TA, (copy(A), TA), ([1, 3], Const); atol, rtol, fkwargs = (inv = true,))
+            EnzymeTestUtils.test_forward(twist!, TA, (copy(A), TA), (1, Const); atol, rtol)
+            EnzymeTestUtils.test_forward(twist!, TA, (copy(A), TA), ([1, 3], Const); atol, rtol)
+        end
+    end
+end
diff --git a/test/enzyme-indexmanipulations-flip-twist/twist.jl b/test/enzyme-indexmanipulations-flip-twist/twist.jl
deleted file mode 100644
index 594b579be..000000000
--- a/test/enzyme-indexmanipulations-flip-twist/twist.jl
+++ /dev/null
@@ -1,30 +0,0 @@
-using Test, TestExtras
-using TensorKit
-using TensorOperations
-using VectorInterface: Zero, One
-using Enzyme, EnzymeTestUtils
-using Random
-
-spacelist = ad_spacelist(fast_tests)
-eltypes = (Float64, ComplexF64)
-
-if !Sys.iswindows() && VERSION > v"1.11.0-rc"
-    @timedtestset "Enzyme - Index Manipulations (twist):" begin
-        @timedtestset "$(TensorKit.type_repr(sectortype(eltype(V)))) ($T)" for V in spacelist, T in eltypes, TA in (Duplicated,)
-            atol = default_tol(T)
-            rtol = default_tol(T)
-            A = randn(T, V[1] ⊗ V[2] ← (V[3] ⊗ V[4] ⊗ V[5])')
-            has_braiding = BraidingStyle(sectortype(eltype(V))) isa HasBraiding
-            if has_braiding && !(T <: Real && !(sectorscalartype(sectortype(A)) <: Real))
-                EnzymeTestUtils.test_reverse(twist!, TA, (copy(A), TA), (1, Const); atol, rtol, fkwargs = (inv = false,))
-                EnzymeTestUtils.test_reverse(twist!, TA, (copy(A), TA), ([1, 3], Const); atol, rtol, fkwargs = (inv = true,))
-                EnzymeTestUtils.test_reverse(twist!, TA, (copy(A), TA), (1, Const); atol, rtol)
-                EnzymeTestUtils.test_reverse(twist!, TA, (copy(A), TA), ([1, 3], Const); atol, rtol)
-                EnzymeTestUtils.test_forward(twist!, TA, (copy(A), TA), (1, Const); atol, rtol, fkwargs = (inv = false,))
-                EnzymeTestUtils.test_forward(twist!, TA, (copy(A), TA), ([1, 3], Const); atol, rtol, fkwargs = (inv = true,))
-                EnzymeTestUtils.test_forward(twist!, TA, (copy(A), TA), (1, Const); atol, rtol)
-                EnzymeTestUtils.test_forward(twist!, TA, (copy(A), TA), ([1, 3], Const); atol, rtol)
-            end
-        end
-    end
-end
diff --git a/test/enzyme-indexmanipulations-transform/braid.jl b/test/enzyme-indexmanipulations-transform/braid.jl
deleted file mode 100644
index 0d4099d13..000000000
--- a/test/enzyme-indexmanipulations-transform/braid.jl
+++ /dev/null
@@ -1,35 +0,0 @@
-using Test, TestExtras
-using TensorKit
-using TensorOperations
-using Enzyme, EnzymeTestUtils
-using Random
-
-spacelist = ad_spacelist(fast_tests)
-eltypes = (Float64, ComplexF64)
-
-is_ci = get(ENV, "CI", "false") == "true"
-Tαs = is_ci ? (Active,) : (Active, Const)
-Tβs = is_ci ? (Active,) : (Active, Const)
-
-if !Sys.iswindows() && VERSION > v"1.11.0-rc"
-    @timedtestset "Enzyme - Index Manipulations (braid!) $(TensorKit.type_repr(sectortype(eltype(V)))) ($T) Tα $Tα Tβ $Tβ" for V in spacelist, T in eltypes, Tα in Tαs, Tβ in Tβs
-        atol = default_tol(T)
-        rtol = default_tol(T)
-        Vstr = TensorKit.type_repr(sectortype(eltype(V)))
-        has_braiding = BraidingStyle(sectortype(eltype(V))) isa HasBraiding
-        if has_braiding
-            A = randn(T, V[1] ⊗ V[2] ← (V[3] ⊗ V[4] ⊗ V[5])')
-            α = randn(T)
-            β = randn(T)
-            p = randcircshift(numout(A), numin(A))
-            levels = Tuple(randperm(numind(A)))
-            C = randn!(transpose(A, p))
-            EnzymeTestUtils.test_reverse(TensorKit.braid!, Duplicated, (C, Duplicated), (A, Duplicated), (p, Const), (levels, Const), (α, Tα), (β, Tβ); atol, rtol, testset_name = "braid! V $Vstr Tα $Tα Tβ $Tβ")
-            if !(T <: Real) && !is_ci
-                EnzymeTestUtils.test_reverse(TensorKit.braid!, Duplicated, (C, Duplicated), (real(A), Duplicated), (p, Const), (levels, Const), (α, Tα), (β, Tβ); atol, rtol, testset_name = "braid! V $Vstr Tα $Tα Tβ $Tβ")
-                EnzymeTestUtils.test_reverse(TensorKit.braid!, Duplicated, (C, Duplicated), (A, Duplicated), (p, Const), (levels, Const), (real(α), Tα), (β, Tβ); atol, rtol, testset_name = "braid! V $Vstr Tα $Tα Tβ $Tβ")
-                EnzymeTestUtils.test_reverse(TensorKit.braid!, Duplicated, (C, Duplicated), (A, Duplicated), (p, Const), (levels, Const), (real(α), Tα), (real(β), Tβ); atol, rtol, testset_name = "braid! V $Vstr Tα $Tα Tβ $Tβ")
-            end
-        end
-    end
-end
diff --git a/test/enzyme-indexmanipulations-transform/permute.jl b/test/enzyme-indexmanipulations-transform/permute.jl
deleted file mode 100644
index d78ec1e41..000000000
--- a/test/enzyme-indexmanipulations-transform/permute.jl
+++ /dev/null
@@ -1,30 +0,0 @@
-using Test, TestExtras
-using TensorKit
-using TensorOperations
-using Enzyme, EnzymeTestUtils
-using Random
-
-spacelist = ad_spacelist(fast_tests)
-eltypes = (Float64, ComplexF64)
-
-is_ci = get(ENV, "CI", "false") == "true"
-Tαs = is_ci ? (Active,) : (Active, Const)
-Tβs = is_ci ? (Active,) : (Active, Const)
-
-if VERSION >= v"1.11.0-rc" # segfault issues on 1.10
-    @timedtestset "Enzyme - Index Manipulations (permute!): $(TensorKit.type_repr(sectortype(eltype(V)))) ($T)" for V in spacelist, T in eltypes
-        println(TensorKit.type_repr(sectortype(eltype(V))))
-        atol = default_tol(T)
-        rtol = default_tol(T)
-        symmetricbraiding = BraidingStyle(sectortype(eltype(V))) isa SymmetricBraiding
-
-        symmetricbraiding && @timedtestset "permute! Tα $Tα, Tβ $Tβ" for Tα in Tαs, Tβ in Tβs
-            A = randn(T, V[1] ⊗ V[2] ← (V[3] ⊗ V[4] ⊗ V[5])')
-            α = randn(T)
-            β = randn(T)
-            p = randindextuple(numind(A))
-            C = randn!(permute(A, p))
-            EnzymeTestUtils.test_reverse(TensorKit.permute!, Duplicated, (C, Duplicated), (A, Duplicated), (p, Const), (α, Tα), (β, Tβ); atol, rtol)
-        end
-    end
-end
diff --git a/test/enzyme-indexmanipulations-transform/transpose.jl b/test/enzyme-indexmanipulations-transform/transpose.jl
deleted file mode 100644
index 7ba3e2d42..000000000
--- a/test/enzyme-indexmanipulations-transform/transpose.jl
+++ /dev/null
@@ -1,37 +0,0 @@
-using Test, TestExtras
-using TensorKit
-using TensorOperations
-using VectorInterface: Zero, One
-using Enzyme, EnzymeTestUtils
-using Random
-
-spacelist = ad_spacelist(fast_tests)
-eltypes = (Float64, ComplexF64)
-
-is_ci = get(ENV, "CI", "false") == "true"
-
-Tαs = is_ci ? (Active,) : (Active, Const)
-Tβs = is_ci ? (Active,) : (Active, Const)
-
-if VERSION > v"1.11.0-rc" # https://github.com/QuantumKitHub/TensorKit.jl/issues/457
-    @timedtestset "Enzyme - Index Manipulations (transpose!) $(TensorKit.type_repr(sectortype(eltype(V)))) ($T)" for V in spacelist, T in eltypes
-        atol = default_tol(T)
-        rtol = default_tol(T)
-        A = randn(T, V[1] ⊗ V[2] ← (V[3] ⊗ V[4] ⊗ V[5])')
-        α = randn(T)
-        β = randn(T)
-
-        # repeat a couple times to get some distribution of arrows
-        p = randcircshift(numout(A), numin(A))
-        C = randn!(transpose(A, p))
-        !is_ci && EnzymeTestUtils.test_reverse(TensorKit.transpose!, Duplicated, (copy(C), Duplicated), (A, Duplicated), (p, Const), (One(), Const), (Zero(), Const); atol, rtol)
-        @testset for Tα in Tαs, Tβ in Tβs
-            EnzymeTestUtils.test_reverse(TensorKit.transpose!, Duplicated, (copy(C), Duplicated), (A, Duplicated), (p, Const), (α, Tα), (β, Tβ); atol, rtol)
-            if !(T <: Real) && !is_ci
-                EnzymeTestUtils.test_reverse(TensorKit.transpose!, Duplicated, (copy(C), Duplicated), (real(A), Duplicated), (p, Const), (α, Tα), (β, Tβ); atol, rtol)
-                EnzymeTestUtils.test_reverse(TensorKit.transpose!, Duplicated, (copy(C), Duplicated), (A, Duplicated), (p, Const), (real(α), Tα), (β, Tβ); atol, rtol)
-                EnzymeTestUtils.test_reverse(TensorKit.transpose!, Duplicated, (copy(C), Duplicated), (real(A), Duplicated), (p, Const), (real(α), Tα), (β, Tβ); atol, rtol)
-            end
-        end
-    end
-end