diff --git a/src/Makefile.am b/src/Makefile.am
index 26372337..0db680d6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -200,9 +200,9 @@ libavx2_la_SOURCES = \
 	strategies/avx2/quant-avx2.h \
 	strategies/avx2/reg_sad_pow2_widths-avx2.h \
 	strategies/avx2/sao-avx2.c \
-	strategies/avx2/sao-avx2.h \
-	strategies/avx2/encode_coding_tree-avx2.c \
-	strategies/avx2/encode_coding_tree-avx2.h
+	strategies/avx2/sao-avx2.h
+#	strategies/avx2/encode_coding_tree-avx2.c \
+#	strategies/avx2/encode_coding_tree-avx2.h
 
 libsse2_la_SOURCES = \
 	strategies/sse2/picture-sse2.c \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 65668f99..5918797c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -16,12 +16,10 @@ TESTS = $(check_PROGRAMS) \
 
 EXTRA_DIST = \
     test_external_symbols.sh \
-    test_interlace.sh \
     test_intra.sh \
     test_invalid_input.sh \
     test_tools.sh \
     test_weird_shapes.sh \
-	test_pu_depth_constraints.sh \
     util.sh
 
 check_PROGRAMS = kvazaar_tests
diff --git a/tests/test_interlace.sh b/tests/test_interlace.sh
deleted file mode 100755
index 1baac061..00000000
--- a/tests/test_interlace.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-set -eu
-. "${0%/*}/util.sh"
-
-valgrind_test 264x130 10 --source-scan-type=tff -p0 --preset=ultrafast --threads=2 --owf=1 --wpp --gop=0
diff --git a/tests/test_intra.sh b/tests/test_intra.sh
index 9215ab29..2bf5e2fd 100755
--- a/tests/test_intra.sh
+++ b/tests/test_intra.sh
@@ -6,6 +6,6 @@ set -eu
 
 . "${0%/*}/util.sh"
 
-common_args='264x130 10 -p1 --threads=2 --owf=1 --no-rdoq --no-deblock --no-sao --no-signhide'
+common_args='264x130 10 -p1 --threads=0 --no-wpp --no-rdoq --no-deblock --no-sao --no-signhide --cpuid=0'
 valgrind_test $common_args --rd=1
 valgrind_test $common_args --rd=2 --no-transform-skip
diff --git a/tests/test_weird_shapes.sh b/tests/test_weird_shapes.sh
index 99a2504b..d6782008 100755
--- a/tests/test_weird_shapes.sh
+++ b/tests/test_weird_shapes.sh
@@ -3,6 +3,6 @@
 set -eu
 . "${0%/*}/util.sh"
 
-valgrind_test  16x16  10 --threads=2 --owf=1 --preset=veryslow
-valgrind_test 256x16  10 --threads=2 --owf=1 --preset=veryslow
-valgrind_test  16x256 10 --threads=2 --owf=1 --preset=veryslow
+valgrind_test  16x16  10 --threads=0 --no-wpp --preset=veryslow
+valgrind_test 256x16  10 --threads=0 --no-wpp --preset=veryslow
+valgrind_test  16x256 10 --threads=0 --no-wpp --preset=veryslow
diff --git a/tests/util.sh b/tests/util.sh
index 34c9c305..f6d956d6 100644
--- a/tests/util.sh
+++ b/tests/util.sh
@@ -6,10 +6,10 @@ set -eu${BASH+o pipefail}
 
 # Temporary files for encoder input and output.
 yuvfile="$(mktemp)"
-hevcfile="$(mktemp)"
+vvcfile="$(mktemp)"
 
 cleanup() {
-    rm -rf "${yuvfile}" "${hevcfile}"
+    rm -rf "${yuvfile}" "${vvcfile}"
 }
 trap cleanup EXIT
 
@@ -46,10 +46,10 @@ valgrind_test() {
     # arguments.
     print_and_run \
         ../libtool execute $valgrind \
-            ../src/kvazaar -i "${yuvfile}" "--input-res=${dimensions}" -o "${hevcfile}" "$@"
+            ../src/kvazaar -i "${yuvfile}" "--input-res=${dimensions}" -o "${vvcfile}" "$@"
 
     print_and_run \
-        TAppDecoderStatic -b "${hevcfile}"
+        DecoderAppStatic -b "${vvcfile}"
 
     cleanup
 }
@@ -67,7 +67,7 @@ encode_test() {
     set +e
     print_and_run \
         ../libtool execute \
-            ../src/kvazaar -i "${yuvfile}" "--input-res=${dimensions}" -o "${hevcfile}" "$@"
+            ../src/kvazaar -i "${yuvfile}" "--input-res=${dimensions}" -o "${vvcfile}" "$@"
     actual_status="$?"
     set -e
     [ ${actual_status} -eq ${expected_status} ]