diff --git a/src/main/resources/templates/c_plus_plus/test/.gitignore b/src/main/resources/templates/c_plus_plus/test/.gitignore
index 94435c6345d7..d779962e6971 100644
--- a/src/main/resources/templates/c_plus_plus/test/.gitignore
+++ b/src/main/resources/templates/c_plus_plus/test/.gitignore
@@ -1,4 +1,4 @@
-/assignment/
+/${studentParentWorkingDirectoryName}/
 /test-reports/
 /build/
 
diff --git a/src/main/resources/templates/c_plus_plus/test/CMakeLists.txt b/src/main/resources/templates/c_plus_plus/test/CMakeLists.txt
index 250620938ac6..1a8988d101ec 100644
--- a/src/main/resources/templates/c_plus_plus/test/CMakeLists.txt
+++ b/src/main/resources/templates/c_plus_plus/test/CMakeLists.txt
@@ -7,7 +7,7 @@ include(CTest)
 
 find_package(Catch2 REQUIRED)
 
-add_subdirectory(assignment)
+add_subdirectory("${studentParentWorkingDirectoryName}")
 
 add_executable(sort-test src/sort-test.cpp)
 target_link_libraries(sort-test assignment Catch2::Catch2WithMain)