diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e1bf7ed..dbf4a79 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -32,8 +32,15 @@
   set(test   ${CMAKE_SOURCE_DIR}/test/src/${name})
 
   add_test(
-    NAME ${name}
-    COMMAND ${script} -f -g ${pttc} -d ${ptdump} -x ${ptxed} ${test}
+    NAME insn-${name}
+    COMMAND ${script} -f -g ${pttc} -d ${ptdump} -x "${ptxed} --insn-decoder" ${test}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ptt-insn
+  )
+
+  add_test(
+    NAME block-${name}
+    COMMAND ${script} -f -g ${pttc} -d ${ptdump} -x "${ptxed} --block-decoder" ${test}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ptt-block
   )
 endfunction(add_ptt_test)
 
@@ -43,6 +50,10 @@
   src/*.ptt
 )
 
+file(MAKE_DIRECTORY
+  ${CMAKE_CURRENT_BINARY_DIR}/ptt-insn
+  ${CMAKE_CURRENT_BINARY_DIR}/ptt-block
+)
 foreach (test ${TESTS})
   add_ptt_test(${test})
 endforeach ()