diff --git a/llvm/test/TableGen/FixedLenDecoderEmitter/InvalidEncoding.td b/llvm/test/TableGen/DecoderEmitter/InvalidEncoding.td
similarity index 100%
rename from llvm/test/TableGen/FixedLenDecoderEmitter/InvalidEncoding.td
rename to llvm/test/TableGen/DecoderEmitter/InvalidEncoding.td
diff --git a/llvm/test/TableGen/FixedLenDecoderEmitter/MultiOps.td b/llvm/test/TableGen/DecoderEmitter/MultiOps.td
similarity index 100%
rename from llvm/test/TableGen/FixedLenDecoderEmitter/MultiOps.td
rename to llvm/test/TableGen/DecoderEmitter/MultiOps.td
diff --git a/llvm/test/TableGen/FixedLenDecoderEmitter/additional-encoding.td b/llvm/test/TableGen/DecoderEmitter/additional-encoding.td
similarity index 100%
rename from llvm/test/TableGen/FixedLenDecoderEmitter/additional-encoding.td
rename to llvm/test/TableGen/DecoderEmitter/additional-encoding.td
diff --git a/llvm/test/TableGen/FixedLenDecoderEmitter/big-filter.td b/llvm/test/TableGen/DecoderEmitter/big-filter.td
similarity index 100%
rename from llvm/test/TableGen/FixedLenDecoderEmitter/big-filter.td
rename to llvm/test/TableGen/DecoderEmitter/big-filter.td
diff --git a/llvm/test/TableGen/FixedLenDecoderEmitter/conflict.td b/llvm/test/TableGen/DecoderEmitter/conflict.td
similarity index 100%
rename from llvm/test/TableGen/FixedLenDecoderEmitter/conflict.td
rename to llvm/test/TableGen/DecoderEmitter/conflict.td
diff --git a/llvm/test/TableGen/FixedLenDecoderEmitter/operand-decoder.td b/llvm/test/TableGen/DecoderEmitter/operand-decoder.td
similarity index 100%
rename from llvm/test/TableGen/FixedLenDecoderEmitter/operand-decoder.td
rename to llvm/test/TableGen/DecoderEmitter/operand-decoder.td
diff --git a/llvm/test/TableGen/FixedLenDecoderEmitter/sub-arg-dag-error-1.td b/llvm/test/TableGen/DecoderEmitter/sub-arg-dag-error-1.td
similarity index 100%
rename from llvm/test/TableGen/FixedLenDecoderEmitter/sub-arg-dag-error-1.td
rename to llvm/test/TableGen/DecoderEmitter/sub-arg-dag-error-1.td
diff --git a/llvm/test/TableGen/FixedLenDecoderEmitter/sub-arg-dag-error-2.td b/llvm/test/TableGen/DecoderEmitter/sub-arg-dag-error-2.td
similarity index 100%
rename from llvm/test/TableGen/FixedLenDecoderEmitter/sub-arg-dag-error-2.td
rename to llvm/test/TableGen/DecoderEmitter/sub-arg-dag-error-2.td
diff --git a/llvm/test/TableGen/FixedLenDecoderEmitter/var-len-conflict-1.td b/llvm/test/TableGen/DecoderEmitter/var-len-conflict-1.td
similarity index 100%
rename from llvm/test/TableGen/FixedLenDecoderEmitter/var-len-conflict-1.td
rename to llvm/test/TableGen/DecoderEmitter/var-len-conflict-1.td
diff --git a/llvm/test/TableGen/FixedLenDecoderEmitter/var-len-conflict-2.td b/llvm/test/TableGen/DecoderEmitter/var-len-conflict-2.td
similarity index 100%
rename from llvm/test/TableGen/FixedLenDecoderEmitter/var-len-conflict-2.td
rename to llvm/test/TableGen/DecoderEmitter/var-len-conflict-2.td