diff --git a/src/cq_cli/cqcodecs/cq_codec_dxf.py b/src/cq_cli/cqcodecs/cq_codec_dxf.py
new file mode 100644
index 0000000..84e4f11
--- /dev/null
+++ b/src/cq_cli/cqcodecs/cq_codec_dxf.py
@@ -0,0 +1,25 @@
+import os, tempfile
+from cadquery import exporters
+import cq_cli.cqcodecs.codec_helpers as helpers
+
+
+def convert(build_result, output_file=None, error_file=None, output_opts=None):
+    # Create a temporary file to put the STL output into
+    temp_dir = tempfile.gettempdir()
+    temp_file = os.path.join(temp_dir, "temp_dxf.dxf")
+
+    # The exporters will add extra output that we do not want, so suppress it
+    with helpers.suppress_stdout_stderr():
+        # Put the DXF output into the temp file
+        exporters.export(
+            build_result.results[0].shape,
+            temp_file,
+            exporters.ExportTypes.DXF,
+            opt=output_opts,
+        )
+
+    # Read the DXF output back in
+    with open(temp_file, "r") as file:
+        dxf_str = file.read()
+
+    return dxf_str
diff --git a/src/cq_cli/cqcodecs/cq_codec_gltf.py b/src/cq_cli/cqcodecs/cq_codec_gltf.py
index 867c737..3274be9 100644
--- a/src/cq_cli/cqcodecs/cq_codec_gltf.py
+++ b/src/cq_cli/cqcodecs/cq_codec_gltf.py
@@ -1,6 +1,4 @@
 import os, tempfile
-from cadquery import exporters
-import cadquery as cq
 import cq_cli.cqcodecs.codec_helpers as helpers
 
 
diff --git a/src/cq_cli/cqcodecs/cq_codec_svg.py b/src/cq_cli/cqcodecs/cq_codec_svg.py
index e9b84a0..b01017c 100644
--- a/src/cq_cli/cqcodecs/cq_codec_svg.py
+++ b/src/cq_cli/cqcodecs/cq_codec_svg.py
@@ -1,6 +1,5 @@
 import os, tempfile
 from cadquery import exporters
-import cadquery as cq
 import cq_cli.cqcodecs.codec_helpers as helpers
 
 
diff --git a/tests/test_dxf_codec.py b/tests/test_dxf_codec.py
new file mode 100644
index 0000000..8992957
--- /dev/null
+++ b/tests/test_dxf_codec.py
@@ -0,0 +1,20 @@
+import tests.test_helpers as helpers
+
+
+def test_dxf_codec():
+    """
+    Basic test of the DXF codec plugin.
+    """
+    test_file = helpers.get_test_file_location("cube.py")
+
+    command = [
+        "python",
+        "src/cq_cli/main.py",
+        "--codec",
+        "dxf",
+        "--infile",
+        test_file,
+    ]
+    out, err, exitcode = helpers.cli_call(command)
+
+    assert out.decode().split("\n")[1].replace("\r", "") == "SECTION"