diff --git a/t/Makefile b/t/Makefile
index fcf205e7d..141bec9d8 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -131,7 +131,8 @@ daemon-tests: daemon-tests-main daemon-tests-jb daemon-tests-pubsub daemon-tests
 	daemon-tests-transcode-config daemon-tests-codec-prefs daemon-tests-http daemon-tests-heuristic \
 	daemon-tests-asymmetric daemon-tests-rtcp daemon-tests-redis-subscribe daemon-tests-rtp-ext \
 	daemon-tests-bundle daemon-tests-dtls \
-	daemon-tests-recording daemon-tests-create
+	daemon-tests-recording daemon-tests-create \
+	daemon-tests-dtx daemon-tests-dtx-cn daemon-tests-dtx-no-shift
 
 daemon-test-deps:	tests-preload.so
 	$(MAKE) -C ../daemon
diff --git a/t/auto-daemon-tests-dtx-cn.pl b/t/auto-daemon-tests-dtx-cn.pl
index 6be67dec8..7e664d87c 100755
--- a/t/auto-daemon-tests-dtx-cn.pl
+++ b/t/auto-daemon-tests-dtx-cn.pl
@@ -9,6 +9,9 @@ use Test::More;
 use POSIX;
 
 
+$ENV{RTPENGINE_EXTENDED_TESTS} or exit;
+
+
 autotest_start(qw(--config-file=none -t -1 -i 203.0.113.1 -i 2001:db8:4321::1
 			-n 2223 -c 12345 -f -L 7 -E -u 2222 --silence-detect=1 --dtx-delay=10
 			--dtx-cn-params=10))
diff --git a/t/auto-daemon-tests-dtx-no-shift.pl b/t/auto-daemon-tests-dtx-no-shift.pl
index a5478d6cc..95c6ee2c5 100755
--- a/t/auto-daemon-tests-dtx-no-shift.pl
+++ b/t/auto-daemon-tests-dtx-no-shift.pl
@@ -9,17 +9,15 @@ use Test::More;
 use POSIX;
 
 
+$ENV{RTPENGINE_EXTENDED_TESTS} or exit;
+
+
 autotest_start(qw(--config-file=none -t -1 -i 203.0.113.1 -i 2001:db8:4321::1
 			-n 2223 -c 12345 -f -L 7 -E -u 2222 --silence-detect=1 --dtx-delay=10
 			--dtx-shift=0))
 		or die;
 
 
-my $amr_tests = $ENV{RTPENGINE_EXTENDED_TESTS};
-#my $amr_tests = 0;
-
-
-
 my ($sock_a, $sock_b, $sock_c, $sock_d, $port_a, $port_b, $ssrc, $ssrc_b, $resp,
 	$sock_ax, $sock_bx, $port_ax, $port_bx,
 	$srtp_ctx_a, $srtp_ctx_b, $srtp_ctx_a_rev, $srtp_ctx_b_rev,
@@ -28,8 +26,6 @@ my ($sock_a, $sock_b, $sock_c, $sock_d, $port_a, $port_b, $ssrc, $ssrc_b, $resp,
 
 
 
-if ($amr_tests) {
-
 ($sock_a, $sock_b) = new_call([qw(198.51.100.10 5210)], [qw(198.51.100.10 5212)]);
 
 ($port_a) = offer('packet loss',
@@ -1538,7 +1534,6 @@ rcv($sock_b, $port_a, rtpm(96, $seq + 11, 9880, $ssrc, "\xf1\x58\x43\x02\x1c\x1c
 
 rtpe_req('delete', 'AMR w reverse DTMF', { 'from-tag' => ft() });
 
-}
 
 
 ($sock_a, $sock_b) = new_call([qw(198.51.100.10 5000)], [qw(198.51.100.10 5002)]);
diff --git a/t/auto-daemon-tests-dtx.pl b/t/auto-daemon-tests-dtx.pl
index 9e78e1fc8..e25e5e82e 100755
--- a/t/auto-daemon-tests-dtx.pl
+++ b/t/auto-daemon-tests-dtx.pl
@@ -9,16 +9,15 @@ use Test::More;
 use POSIX;
 
 
+$ENV{RTPENGINE_EXTENDED_TESTS} or exit;
+
+
 autotest_start(qw(--config-file=none -t -1 -i 203.0.113.1 -i 2001:db8:4321::1
 			-n 2223 -f -L 7 -E --silence-detect=1 --dtx-delay=10
 			--max-dtx=10))
 		or die;
 
 
-my $amr_tests = $ENV{RTPENGINE_EXTENDED_TESTS};
-#my $amr_tests = 0;
-
-
 
 my ($sock_a, $sock_b, $sock_c, $sock_d, $port_a, $port_b, $ssrc, $ssrc_b, $resp,
 	$sock_ax, $sock_bx, $port_ax, $port_bx,
@@ -27,11 +26,6 @@ my ($sock_a, $sock_b, $sock_c, $sock_d, $port_a, $port_b, $ssrc, $ssrc_b, $resp,
 
 
 
-
-if ($amr_tests) {
-
-
-
 ($sock_a, $sock_b) = new_call([qw(198.51.100.21 7294)], [qw(198.51.100.21 7296)]);
 
 ($port_a) = offer('seq nr codec change', {
@@ -1702,7 +1696,6 @@ rcv($sock_b, $port_a, rtpm(96, $seq + 11, 9880, $ssrc, "\xf1\x58\x43\x02\x1c\x1c
 
 rtpe_req('delete', 'AMR w reverse DTMF', { 'from-tag' => ft() });
 
-}
 
 
 ($sock_a, $sock_b) = new_call([qw(198.51.100.10 5000)], [qw(198.51.100.10 5002)]);