diff --git a/test/unit/utM3DImportExport.cpp b/test/unit/utM3DImportExport.cpp
index 24359d319..7efc24985 100644
--- a/test/unit/utM3DImportExport.cpp
+++ b/test/unit/utM3DImportExport.cpp
@@ -43,39 +43,41 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "AbstractImportExportBase.h"
 #include "UnitTestPCH.h"
 
-#include <assimp/Importer.hpp>
-#include <assimp/Exporter.hpp>
 #include <assimp/postprocess.h>
+#include <assimp/Exporter.hpp>
 #include <assimp/Importer.hpp>
 
 using namespace Assimp;
 
-TEST(utM3DImportExport, import_cube_normals) {
-    Assimp::Importer importer;
-    const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/M3D/cube_normals.m3d", aiProcess_ValidateDataStructure);
+class utM3DImportExport : public AbstractImportExportBase {
+public:
+    bool importerTest() override {
+        Assimp::Importer importer;
+        const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/M3D/cube_normals.m3d", aiProcess_ValidateDataStructure);
 #ifndef ASSIMP_BUILD_NO_M3D_IMPORTER
-    ASSERT_NE(nullptr, scene);
+        return nullptr != scene;
 #else
-    ASSERT_EQ(nullptr, scene);
+        return nullptr == scene;
 #endif // ASSIMP_BUILD_NO_M3D_IMPORTER
-}
+    }
 
-TEST(utM3DImportExport, import_cube_usemtl) {
-    Assimp::Importer importer;
-    const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/M3D/cube_usemtl.m3d", aiProcess_ValidateDataStructure);
-#ifndef ASSIMP_BUILD_NO_M3D_IMPORTER
-    ASSERT_NE(nullptr, scene);
-#else
-    ASSERT_EQ(nullptr, scene);
-#endif // ASSIMP_BUILD_NO_M3D_IMPORTER
+#ifndef ASSIMP_BUILD_NO_EXPORT
+    bool exporterTest() override {
+        Assimp::Importer importer;
+        const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/M3D/cube_normals.m3d", aiProcess_ValidateDataStructure);
+        Exporter exporter;
+        aiReturn ret = exporter.Export(scene, "m3d", ASSIMP_TEST_MODELS_DIR "/M3D/cube_normals_out.m3d");
+        return ret == AI_SUCCESS;
+    }
+#endif
+};
+
+TEST_F(utM3DImportExport, importM3DFromFileTest) {
+    EXPECT_TRUE(importerTest());
 }
 
 #ifndef ASSIMP_BUILD_NO_EXPORT
-TEST(utM3DImportExport, export_cube_normals) {
-    Assimp::Importer importer;
-    const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/M3D/cube_normals.m3d", aiProcess_ValidateDataStructure);
-    Exporter exporter;
-    aiReturn ret = exporter.Export(scene, "m3d", ASSIMP_TEST_MODELS_DIR "/M3D/cube_normals_out.m3d");
-    ASSERT_EQ(AI_SUCCESS, ret);
+TEST_F(utM3DImportExport, exportM3DFromFileTest) {
+    EXPECT_TRUE(exporterTest());
 }
 #endif //  ASSIMP_BUILD_NO_EXPORT