diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab0b63a6..d8c37bbc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -340,6 +340,9 @@ if(NOT DEFINED MSVC)
   if(NOT "test_external_symbols" IN_LIST XFAIL)
     add_test( NAME test_external_symbols COMMAND ${PROJECT_SOURCE_DIR}/tests/test_external_symbols.sh WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests)
   endif()
+  if(NOT "test_mtt" IN_LIST XFAIL)
+    add_test( NAME test_mtt COMMAND ${PROJECT_SOURCE_DIR}/tests/test_mtt.sh WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests)
+  endif()
   if(NOT "test_intra" IN_LIST XFAIL)
     add_test( NAME test_intra COMMAND ${PROJECT_SOURCE_DIR}/tests/test_intra.sh WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests)
   endif()
diff --git a/tests/test_cabac_state.sh b/tests/test_cabac_state.sh
index e60806dc..865d9018 100755
--- a/tests/test_cabac_state.sh
+++ b/tests/test_cabac_state.sh
@@ -6,10 +6,10 @@ set -eu
 
 cabacfile="$(mktemp)"
 
-valgrind_test 256x128 10 yuv420p --preset veryslow --pu-depth-intra 0-4 --cclm --rd 3 --mip --jccr --mrl --lfnst -p 1 --owf 0 --no-wpp --cabac-debug-file="${cabacfile}"
+valgrind_test 256x128 10 yuv420p --preset veryslow --pu-depth-intra 0-8 --mtt-depth-intra 3 --mtt-depth-intra-chroma 3 --cclm --rd 3 --mip --jccr --mrl --lfnst -p 1 --owf 0 --no-wpp --cabac-debug-file="${cabacfile}"
 python3 check_cabac_state_consistency.py "${cabacfile}"
 
-valgrind_test 256x128 10 yuv420p --preset veryslow --pu-depth-intra 0-4 --cclm --rd 3 --mip --jccr --mrl --lfnst --dual-tree -p 1 --owf 0 --no-wpp --cabac-debug-file="${cabacfile}"
+valgrind_test 256x128 10 yuv420p --preset veryslow --pu-depth-intra 0-8 --mtt-depth-intra 3 --mtt-depth-intra-chroma 3 --cclm --rd 3 --mip --jccr --mrl --lfnst --dual-tree -p 1 --owf 0 --no-wpp --cabac-debug-file="${cabacfile}"
 python3 check_cabac_state_consistency.py "${cabacfile}"
 
 rm -rf "${cabacfile}"
diff --git a/tests/test_mtt.sh b/tests/test_mtt.sh
new file mode 100644
index 00000000..5fc5587b
--- /dev/null
+++ b/tests/test_mtt.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# Test all-intra coding.
+
+set -eu
+
+. "${0%/*}/util.sh"
+
+common_args='264x130 10 yuv420p -p1 --preset=ultrafast --threads=0 --no-cpuid --no-wpp --fast-residual-cost 0'
+valgrind_test $common_args --rd=0 --mtt-depth-intra 1 --pu-depth-intra 2-3
+valgrind_test $common_args --rd=3 --mtt-depth-intra 1 --pu-depth-intra 0-5
+valgrind_test $common_args --rd=3 --mtt-depth-intra 3 --pu-depth-intra 0-8
+valgrind_test $common_args --rd=3 --mtt-depth-intra 3 --mtt-depth-intra-chroma 3 --dual-tree --pu-depth-intra 0-8
+valgrind_test $common_args --rd=3 --rdoq --jccr --isp --lfnst --mip --mrl --mts intra --cclm --mtt-depth-intra 3 --mtt-depth-intra-chroma 3 --dual-tree --pu-depth-intra 0-8