diff --git a/cranelift/filetests/filetests/vcode/aarch64/amodes.clif b/cranelift/filetests/filetests/isa/aarch64/amodes.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/amodes.clif
rename to cranelift/filetests/filetests/isa/aarch64/amodes.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/arithmetic.clif b/cranelift/filetests/filetests/isa/aarch64/arithmetic.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/arithmetic.clif
rename to cranelift/filetests/filetests/isa/aarch64/arithmetic.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/basic1.clif b/cranelift/filetests/filetests/isa/aarch64/basic1.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/basic1.clif
rename to cranelift/filetests/filetests/isa/aarch64/basic1.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/bitops.clif b/cranelift/filetests/filetests/isa/aarch64/bitops.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/bitops.clif
rename to cranelift/filetests/filetests/isa/aarch64/bitops.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/call-indirect.clif b/cranelift/filetests/filetests/isa/aarch64/call-indirect.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/call-indirect.clif
rename to cranelift/filetests/filetests/isa/aarch64/call-indirect.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/call.clif b/cranelift/filetests/filetests/isa/aarch64/call.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/call.clif
rename to cranelift/filetests/filetests/isa/aarch64/call.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/condbr.clif b/cranelift/filetests/filetests/isa/aarch64/condbr.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/condbr.clif
rename to cranelift/filetests/filetests/isa/aarch64/condbr.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/condops.clif b/cranelift/filetests/filetests/isa/aarch64/condops.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/condops.clif
rename to cranelift/filetests/filetests/isa/aarch64/condops.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/constants.clif b/cranelift/filetests/filetests/isa/aarch64/constants.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/constants.clif
rename to cranelift/filetests/filetests/isa/aarch64/constants.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/extend-op.clif b/cranelift/filetests/filetests/isa/aarch64/extend-op.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/extend-op.clif
rename to cranelift/filetests/filetests/isa/aarch64/extend-op.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/fcvt-small.clif b/cranelift/filetests/filetests/isa/aarch64/fcvt-small.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/fcvt-small.clif
rename to cranelift/filetests/filetests/isa/aarch64/fcvt-small.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/floating-point.clif b/cranelift/filetests/filetests/isa/aarch64/floating-point.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/floating-point.clif
rename to cranelift/filetests/filetests/isa/aarch64/floating-point.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/heap_addr.clif b/cranelift/filetests/filetests/isa/aarch64/heap_addr.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/heap_addr.clif
rename to cranelift/filetests/filetests/isa/aarch64/heap_addr.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/iconst-icmp-small.clif b/cranelift/filetests/filetests/isa/aarch64/iconst-icmp-small.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/iconst-icmp-small.clif
rename to cranelift/filetests/filetests/isa/aarch64/iconst-icmp-small.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/jumptable.clif b/cranelift/filetests/filetests/isa/aarch64/jumptable.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/jumptable.clif
rename to cranelift/filetests/filetests/isa/aarch64/jumptable.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/multivalue-ret.clif b/cranelift/filetests/filetests/isa/aarch64/multivalue-ret.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/multivalue-ret.clif
rename to cranelift/filetests/filetests/isa/aarch64/multivalue-ret.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/narrow-arithmetic.clif b/cranelift/filetests/filetests/isa/aarch64/narrow-arithmetic.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/narrow-arithmetic.clif
rename to cranelift/filetests/filetests/isa/aarch64/narrow-arithmetic.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/reftypes.clif b/cranelift/filetests/filetests/isa/aarch64/reftypes.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/reftypes.clif
rename to cranelift/filetests/filetests/isa/aarch64/reftypes.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/saturating-ops.clif b/cranelift/filetests/filetests/isa/aarch64/saturating-ops.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/saturating-ops.clif
rename to cranelift/filetests/filetests/isa/aarch64/saturating-ops.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/shift-op.clif b/cranelift/filetests/filetests/isa/aarch64/shift-op.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/shift-op.clif
rename to cranelift/filetests/filetests/isa/aarch64/shift-op.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/shift-rotate.clif b/cranelift/filetests/filetests/isa/aarch64/shift-rotate.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/shift-rotate.clif
rename to cranelift/filetests/filetests/isa/aarch64/shift-rotate.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/stack-limit.clif b/cranelift/filetests/filetests/isa/aarch64/stack-limit.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/stack-limit.clif
rename to cranelift/filetests/filetests/isa/aarch64/stack-limit.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/stack.clif b/cranelift/filetests/filetests/isa/aarch64/stack.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/stack.clif
rename to cranelift/filetests/filetests/isa/aarch64/stack.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/symbol-value.clif b/cranelift/filetests/filetests/isa/aarch64/symbol-value.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/symbol-value.clif
rename to cranelift/filetests/filetests/isa/aarch64/symbol-value.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/traps.clif b/cranelift/filetests/filetests/isa/aarch64/traps.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/traps.clif
rename to cranelift/filetests/filetests/isa/aarch64/traps.clif
diff --git a/cranelift/filetests/filetests/vcode/aarch64/uextend-sextend.clif b/cranelift/filetests/filetests/isa/aarch64/uextend-sextend.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/aarch64/uextend-sextend.clif
rename to cranelift/filetests/filetests/isa/aarch64/uextend-sextend.clif
diff --git a/cranelift/filetests/filetests/vcode/arm32/aluops.clif b/cranelift/filetests/filetests/isa/arm32/aluops.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/arm32/aluops.clif
rename to cranelift/filetests/filetests/isa/arm32/aluops.clif
diff --git a/cranelift/filetests/filetests/vcode/arm32/bitops.clif b/cranelift/filetests/filetests/isa/arm32/bitops.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/arm32/bitops.clif
rename to cranelift/filetests/filetests/isa/arm32/bitops.clif
diff --git a/cranelift/filetests/filetests/vcode/arm32/cond.clif b/cranelift/filetests/filetests/isa/arm32/cond.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/arm32/cond.clif
rename to cranelift/filetests/filetests/isa/arm32/cond.clif
diff --git a/cranelift/filetests/filetests/vcode/arm32/constants.clif b/cranelift/filetests/filetests/isa/arm32/constants.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/arm32/constants.clif
rename to cranelift/filetests/filetests/isa/arm32/constants.clif
diff --git a/cranelift/filetests/filetests/vcode/arm32/control-flow.clif b/cranelift/filetests/filetests/isa/arm32/control-flow.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/arm32/control-flow.clif
rename to cranelift/filetests/filetests/isa/arm32/control-flow.clif
diff --git a/cranelift/filetests/filetests/vcode/arm32/extend.clif b/cranelift/filetests/filetests/isa/arm32/extend.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/arm32/extend.clif
rename to cranelift/filetests/filetests/isa/arm32/extend.clif
diff --git a/cranelift/filetests/filetests/vcode/arm32/params.clif b/cranelift/filetests/filetests/isa/arm32/params.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/arm32/params.clif
rename to cranelift/filetests/filetests/isa/arm32/params.clif
diff --git a/cranelift/filetests/filetests/vcode/arm32/shift-rotate.clif b/cranelift/filetests/filetests/isa/arm32/shift-rotate.clif
similarity index 100%
rename from cranelift/filetests/filetests/vcode/arm32/shift-rotate.clif
rename to cranelift/filetests/filetests/isa/arm32/shift-rotate.clif