diff --git a/Makefile b/Makefile
index f9c1fa37..bc59c2d6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DEV_VERSION=v3.1.3wax02-v3.0.1
+DEV_VERSION=v5.0.3wax01-v4.1.0
 DEV_DOCKER_IMAGE=waxteam/waxdev:$(DEV_VERSION)
 DEV_DOCKER_CONTAINER=contracts-development
 DEV_DOCKER_COMMON=-v `pwd`:/opt/contracts \
diff --git a/contracts/CMakeLists.txt b/contracts/CMakeLists.txt
index f08da324..22926413 100644
--- a/contracts/CMakeLists.txt
+++ b/contracts/CMakeLists.txt
@@ -10,8 +10,8 @@ option(SYSTEM_BLOCKCHAIN_PARAMETERS
 
 find_package(cdt)
 
-set(CDT_VERSION_MIN "3.0")
-set(CDT_VERSION_SOFT_MAX "3.0")
+set(CDT_VERSION_MIN "4.1")
+set(CDT_VERSION_SOFT_MAX "4.1")
 # set(CDT_VERSION_HARD_MAX "")
 
 # Check the version of CDT
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index aa8e3e04..21dc67af 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 
-set(EOSIO_VERSION_MIN "3.1")
-set(EOSIO_VERSION_SOFT_MAX "3.1")
+set(EOSIO_VERSION_MIN "5.0")
+set(EOSIO_VERSION_SOFT_MAX "5.0")
 # set(EOSIO_VERSION_HARD_MAX "")
 
 find_package(leap)
diff --git a/tests/eosio.limitauth_tests.cpp b/tests/eosio.limitauth_tests.cpp
index ded793c2..c873d9ce 100644
--- a/tests/eosio.limitauth_tests.cpp
+++ b/tests/eosio.limitauth_tests.cpp
@@ -1,4 +1,3 @@
-#include <Runtime/Runtime.h>
 #include <boost/test/unit_test.hpp>
 #include <cstdlib>
 #include <eosio/chain/contract_table_objects.hpp>
diff --git a/tests/eosio.msig_tests.cpp b/tests/eosio.msig_tests.cpp
index 070077fb..b470c067 100644
--- a/tests/eosio.msig_tests.cpp
+++ b/tests/eosio.msig_tests.cpp
@@ -3,8 +3,6 @@
 #include <eosio/chain/abi_serializer.hpp>
 #include <eosio/chain/wast_to_wasm.hpp>
 
-#include <Runtime/Runtime.h>
-
 #include <fc/variant_object.hpp>
 #include "contracts.hpp"
 #include "test_symbol.hpp"
diff --git a/tests/eosio.system_claimgenesis_tests.cpp b/tests/eosio.system_claimgenesis_tests.cpp
index 3b3264df..4419af71 100644
--- a/tests/eosio.system_claimgenesis_tests.cpp
+++ b/tests/eosio.system_claimgenesis_tests.cpp
@@ -8,7 +8,6 @@
 #include <sstream>
 #include <fc/log/logger.hpp>
 #include <eosio/chain/exceptions.hpp>
-#include <Runtime/Runtime.h>
 
 #include "eosio.system_tester.hpp"
 struct _abi_hash {
diff --git a/tests/eosio.system_tester.hpp b/tests/eosio.system_tester.hpp
index 162b82a9..0b1d75df 100644
--- a/tests/eosio.system_tester.hpp
+++ b/tests/eosio.system_tester.hpp
@@ -17,9 +17,9 @@ using mvo = fc::mutable_variant_object;
 
 #ifndef TESTER
 #ifdef NON_VALIDATING_TEST
-#define TESTER tester
+#define TESTER tester_no_disable_deferred_trx
 #else
-#define TESTER validating_tester
+#define TESTER validating_tester_no_disable_deferred_trx
 #endif
 #endif
 
diff --git a/tests/eosio.system_tests.cpp b/tests/eosio.system_tests.cpp
index d5b20be4..f09f0ed9 100644
--- a/tests/eosio.system_tests.cpp
+++ b/tests/eosio.system_tests.cpp
@@ -8,7 +8,6 @@
 #include <sstream>
 #include <fc/log/logger.hpp>
 #include <eosio/chain/exceptions.hpp>
-#include <Runtime/Runtime.h>
 
 #include "eosio.system_tester.hpp"
 struct _abi_hash {
@@ -3334,7 +3333,7 @@ BOOST_FIXTURE_TEST_CASE(producers_upgrade_system_contract, eosio_system_tester)
    {
       //prepare system contract with different hash (contract differs in one byte)
       auto code = contracts::system_wasm();
-      string msg = "producer votes must be unique and sorted";
+      string msg = "producer votes must be unique";
       auto it = std::search( code.begin(), code.end(), msg.begin(), msg.end() );
       BOOST_REQUIRE( it != code.end() );
       msg[0] = 'P';
diff --git a/tests/eosio.token_tests.cpp b/tests/eosio.token_tests.cpp
index 68e7d554..d469ce01 100644
--- a/tests/eosio.token_tests.cpp
+++ b/tests/eosio.token_tests.cpp
@@ -3,8 +3,6 @@
 #include <eosio/chain/abi_serializer.hpp>
 #include "eosio.system_tester.hpp"
 
-#include "Runtime/Runtime.h"
-
 #include <fc/variant_object.hpp>
 
 using namespace eosio::testing;
diff --git a/tests/eosio.wps_tests.cpp b/tests/eosio.wps_tests.cpp
index a8ea3738..935bdb4c 100644
--- a/tests/eosio.wps_tests.cpp
+++ b/tests/eosio.wps_tests.cpp
@@ -8,7 +8,6 @@
 #include <sstream>
 #include <fc/log/logger.hpp>
 #include <eosio/chain/exceptions.hpp>
-#include <Runtime/Runtime.h>
 
 #include "eosio.system_tester.hpp"
 
diff --git a/tests/eosio.wrap_tests.cpp b/tests/eosio.wrap_tests.cpp
index 4a5c7c30..b9cd02cf 100644
--- a/tests/eosio.wrap_tests.cpp
+++ b/tests/eosio.wrap_tests.cpp
@@ -2,8 +2,6 @@
 #include <eosio/testing/tester.hpp>
 #include <eosio/chain/abi_serializer.hpp>
 
-#include <Runtime/Runtime.h>
-
 #include <fc/variant_object.hpp>
 
 #include "contracts.hpp"
@@ -19,7 +17,7 @@ using mvo = fc::mutable_variant_object;
 class eosio_wrap_tester : public tester {
 public:
 
-   eosio_wrap_tester() {
+   eosio_wrap_tester(): tester(setup_policy::full_except_do_not_disable_deferred_trx) {
       create_accounts( { "eosio.msig"_n, "prod1"_n, "prod2"_n, "prod3"_n, "prod4"_n, "prod5"_n, "alice"_n, "bob"_n, "carol"_n } );
       produce_block();
 
diff --git a/tests/main.cpp b/tests/main.cpp
index e3d61750..027bdd13 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -8,7 +8,6 @@
 #include <boost/test/included/unit_test.hpp>
 #include <fc/log/logger.hpp>
 #include <eosio/chain/exceptions.hpp>
-#include <Runtime/Runtime.h>
 
 #include "eosio.system_tester.hpp"