diff --git a/arch/patmos/CMakeLists.txt b/arch/patmos/CMakeLists.txt
index 1edbc2d8e8011cade1ada580ace96d3318e336e8..c9f4b7df8e6b9a2929cc4ece24b68b4c19ead84d 100644
--- a/arch/patmos/CMakeLists.txt
+++ b/arch/patmos/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Add pasim as an addtional target. This results in the CMakeLists.txt
-# to be loaded afterwards
-set(ADDITIONAL_TARGETS ${ADDITIONAL_TARGETS}
-  ${CMAKE_CURRENT_SOURCE_DIR}/pasim CACHE INTERNAL STRING)
-
 SET(PASIM_FREQ 10 CACHE INTERNAL STRING)
 
 set(SRCS
@@ -26,6 +21,13 @@ target_link_libraries(arch generic)
 dosek_include_dir(${CMAKE_CURRENT_SOURCE_DIR})
 set(ARCH_INCLUDE_DIRS ${ARCH_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL STRING)
 
+# Get pasim binary
+find_program(PASIM "pasim")
+if(NOT PASIM)
+	message(WARNING "[${PROJECT_NAME} No PASIM found, not generating PASIM targets!")
+	return()
+endif()
+
 # POSIX dOSEK executable macro
 macro(dosek_executable ELFFILE)
   set(options "EXCLUDE_FROM_ALL")
@@ -77,6 +79,7 @@ macro(dosek_executable ELFFILE)
       COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/${ELFFILE}/gcfg.pml ${PROJECT_BINARY_DIR}/${ELFFILE}-gcfg.pml
       )
 
+    # target to run the static analysis with platin
     add_custom_target(wcet-${ELFFILE}
       COMMENT "Timing Analysis for ${ELFFILE}"
       DEPENDS ${ELFFILE}
@@ -84,6 +87,13 @@ macro(dosek_executable ELFFILE)
           --wca-count-instructions --disable-ait --wca-detect-gurobi
           --dref-stats ${PROJECT_BINARY_DIR}/${ELFFILE}.`printenv CIRCUIT`.dref
           -e GCFG:timing-`printenv CIRCUIT`)
+
+    # target to run a simulation with pasim
+    add_custom_target(test-${ELFFILE}
+      DEPENDS  ${ELFFILE}
+      COMMENT "[${PROJECT_NAME}] Running ${ELFFILE} in pasim."
+      COMMAND ${PASIM} $<TARGET_FILE:${ELFFILE}> --freq ${PASIM_FREQ})
+
   endif()
 
   # add to executables list
diff --git a/arch/patmos/pasim/CMakeLists.txt b/arch/patmos/pasim/CMakeLists.txt
deleted file mode 100644
index 122d9b792547584074f789f9f2e054228694333e..0000000000000000000000000000000000000000
--- a/arch/patmos/pasim/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# Get QEMU binary
-find_program(PASIM "pasim")
-if(NOT PASIM)
-	message(WARNING "[${PROJECT_NAME} No PASIM found, not generating PASIM targets!")
-	return()
-endif()
-# Create additional targets for all executables
-foreach(ELF ${EXECUTABLES})
-    add_custom_target(test-${ELF}
-		DEPENDS  ${ELF}
-		COMMENT "[${PROJECT_NAME}] Running ${ELF} in pasim."
-		COMMAND ${PASIM} $<TARGET_FILE:${ELF}> --freq ${PASIM_FREQ}
-                )
-endforeach()