diff --git a/filter/CppunitTest_filter_dxf_test.mk b/filter/CppunitTest_filter_dxf_test.mk
new file mode 100644
index 000000000000..538051f6a523
--- /dev/null
+++ b/filter/CppunitTest_filter_dxf_test.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,filter_dxf_test))
+
+$(eval $(call gb_CppunitTest_use_external,filter_dxf_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,filter_dxf_test, \
+    filter/qa/cppunit/filters-dxf-test \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,filter_dxf_test, \
+	idx \
+	sal \
+	test \
+	tl \
+	unotest \
+	vcl \
+	$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,filter_dxf_test,\
+    udkapi \
+    offapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,filter_dxf_test))
+$(eval $(call gb_CppunitTest_use_vcl,filter_dxf_test))
+
+$(eval $(call gb_CppunitTest_use_components,filter_dxf_test,\
+    configmgr/source/configmgr \
+    i18npool/util/i18npool \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,filter_dxf_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 79100a73ffa7..25698b9cc14f 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -85,6 +85,7 @@ $(eval $(call gb_Module_add_check_targets,filter,\
 
 ifneq ($(DISABLE_CVE_TESTS),TRUE)
 $(eval $(call gb_Module_add_check_targets,filter,\
+    CppunitTest_filter_dxf_test \
     CppunitTest_filter_pcx_test \
     CppunitTest_filter_pict_test \
     CppunitTest_filter_ppm_test \
diff --git a/filter/qa/cppunit/data/dxf/fail/.gitignore b/filter/qa/cppunit/data/dxf/fail/.gitignore
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/filter/qa/cppunit/data/dxf/indeterminate/.gitignore b/filter/qa/cppunit/data/dxf/indeterminate/.gitignore
new file mode 100644
index 000000000000..583b009c7c60
--- /dev/null
+++ b/filter/qa/cppunit/data/dxf/indeterminate/.gitignore
@@ -0,0 +1 @@
+*.wmf-*
diff --git a/filter/qa/cppunit/data/dxf/pass/.gitignore b/filter/qa/cppunit/data/dxf/pass/.gitignore
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/filter/qa/cppunit/filters-dxf-test.cxx b/filter/qa/cppunit/filters-dxf-test.cxx
new file mode 100644
index 000000000000..336b6cd35899
--- /dev/null
+++ b/filter/qa/cppunit/filters-dxf-test.cxx
@@ -0,0 +1,71 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <unotest/filters-test.hxx>
+#include <test/bootstrapfixture.hxx>
+#include <vcl/FilterConfigItem.hxx>
+#include <tools/stream.hxx>
+#include <vcl/graph.hxx>
+
+#include <osl/file.hxx>
+#include <osl/process.h>
+
+extern "C"
+{
+    SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+        GraphicImport(SvStream & rStream, Graphic & rGraphic,
+        FilterConfigItem*);
+}
+
+using namespace ::com::sun::star;
+
+/* Implementation of Filters test */
+
+class DxfFilterTest
+    : public test::FiltersTest
+    , public test::BootstrapFixture
+{
+public:
+    DxfFilterTest() : BootstrapFixture(true, false) {}
+
+    virtual bool load(const OUString &,
+        const OUString &rURL, const OUString &,
+        unsigned int, unsigned int, unsigned int) SAL_OVERRIDE;
+
+    /**
+     * Ensure CVEs remain unbroken
+     */
+    void testCVEs();
+
+    CPPUNIT_TEST_SUITE(DxfFilterTest);
+    CPPUNIT_TEST(testCVEs);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+bool DxfFilterTest::load(const OUString &,
+    const OUString &rURL, const OUString &,
+    unsigned int, unsigned int, unsigned int)
+{
+    SvFileStream aFileStream(rURL, STREAM_READ);
+    Graphic aGraphic;
+    return GraphicImport(aFileStream, aGraphic, NULL);
+}
+
+void DxfFilterTest::testCVEs()
+{
+    testDir(OUString(),
+        getURLFromSrc("/filter/qa/cppunit/data/dxf/"),
+        OUString());
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(DxfFilterTest);
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */