diff --git a/test/functional/CMakeLists.txt b/test/functional/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..cfe3a15a2fd8db6e55c54f6a04f3a499fecfbae0
--- /dev/null
+++ b/test/functional/CMakeLists.txt
@@ -0,0 +1,7 @@
+# --------------------------------------------------------------------------------------------------
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-FileCopyrightText: (C) 2022 Jayesh Badwaik <j.badwaik@fz-juelich.de>
+# --------------------------------------------------------------------------------------------------
+
+
+add_functional_test_directory(noddy libtestzell "functional_test,production.test")
diff --git a/test/unit/cpp/noddy/wsv.t.cpp b/test/functional/noddy/wsv.t.cpp
similarity index 98%
rename from test/unit/cpp/noddy/wsv.t.cpp
rename to test/functional/noddy/wsv.t.cpp
index 097f2b0b8c8155b5e8f7f0102d30ee06b0cd7636..b53084ec444bc275b44b7457b82b14d19e42accf 100644
--- a/test/unit/cpp/noddy/wsv.t.cpp
+++ b/test/functional/noddy/wsv.t.cpp
@@ -13,7 +13,7 @@
 
 #include <iostream>
 
-TESTMOL_CATCH_MAIN("test/unit/noddy/wsv")
+TESTMOL_CATCH_MAIN("test/functional/noddy/wsv")
 
 TEST_CASE("01: read wsv file", "[all]")
 {
diff --git a/test/unit/cpp/CMakeLists.txt b/test/unit/cpp/CMakeLists.txt
index bb1aceafbc5471f9461a8af9371aca52d6b36178..4df57a0ce98cd3c0b7832fa06ed44eaa4e12061e 100644
--- a/test/unit/cpp/CMakeLists.txt
+++ b/test/unit/cpp/CMakeLists.txt
@@ -5,7 +5,6 @@
 
 add_unit_test_directory(bati libtestzell cpp "unit_test,production.test")
 add_unit_test_directory(mol libtestzell cpp "unit_test,production.test")
-add_unit_test_directory(noddy libtestzell cpp "unit_test,production.test")
 add_unit_test_directory(nola libtestzell cpp "unit_test,production.test")
 add_unit_test_directory(zell libtestzell cpp "unit_test,production.test")
 add_unit_test_directory(testzell libtestzell cpp "unit_test,production.test")