diff --git a/Doxyfile b/Doxyfile
index f9460d39..a703d679 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -1014,7 +1014,7 @@ EXAMPLE_RECURSIVE      = NO
 # \image command).
 
 IMAGE_PATH             = docs/img
-IMAGE_PATH             += docs/diagrams
+IMAGE_PATH             += docs/diagrams/plantuml
 IMAGE_PATH             += docs/test_cases
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
diff --git a/Makefile b/Makefile
index 1aa1a44b..39675248 100644
--- a/Makefile
+++ b/Makefile
@@ -162,8 +162,8 @@ docs:
 doxygen: docs
 	cp CONTRIBUTING.md docs/contributing.md
 	cp CHANGELOG.md docs/changelog.md
-	cp docs/diagrams/plantuml/*.svg docs/doxygen/html/
 	mkdir -p docs/doxygen/html/test_cases
+	cp docs/diagrams/plantuml/*.svg docs/doxygen/html/
 	cp docs/test_cases/*.svg docs/doxygen/html/test_cases/
 	../doxygen/_build/bin/doxygen