diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b1783520..4c02f600 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -4,7 +4,9 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 set(CMAKE_CXX_STANDARD 17)
 
-set(CMAKE_CXX_FLAGS "-std=c++17 ${LIBCLANG_CXXFLAGS}")
+set(TEST_DISABLE_WARNINGS "-Wno-unused-parameter -Wno-unused-variable -Wno-attributes")
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBCLANG_CXXFLAGS} ${TEST_DISABLE_WARNINGS}")
 
 file(GLOB_RECURSE TEST_CASE_SOURCES t*/*.cc)
 file(GLOB_RECURSE TEST_CASE_CONFIGS t*/.clang-uml)
diff --git a/tests/test_cases.cc b/tests/test_cases.cc
index 02683907..6abba504 100644
--- a/tests/test_cases.cc
+++ b/tests/test_cases.cc
@@ -55,7 +55,7 @@ generate_sequence_diagram(cppast::libclang_compilation_database &db,
         diagram_config, diagram_visitor>(db, diagram->name,
         dynamic_cast<clanguml::config::sequence_diagram &>(*diagram));
 
-    return std::move(model);
+    return model;
 }
 
 std::unique_ptr<clanguml::class_diagram::model::diagram> generate_class_diagram(
@@ -73,7 +73,7 @@ std::unique_ptr<clanguml::class_diagram::model::diagram> generate_class_diagram(
         diagram_config, diagram_visitor>(
         db, diagram->name, dynamic_cast<diagram_config &>(*diagram));
 
-    return std::move(model);
+    return model;
 }
 
 std::unique_ptr<clanguml::package_diagram::model::diagram>