diff --git a/system-test/maxtest/include/maxtest/testconnections.hh b/system-test/maxtest/include/maxtest/testconnections.hh
index cbe7e26b2..98ff357c7 100644
--- a/system-test/maxtest/include/maxtest/testconnections.hh
+++ b/system-test/maxtest/include/maxtest/testconnections.hh
@@ -152,6 +152,12 @@ public:
      */
     bool no_xpand;
 
+    /**
+     * @brief maxscale_product 'maxscale' - use production version of Maxscale,
+     *  'maxscale_ci' - CI
+     */
+    char * maxscale_product;
+
     /**
      * @brief timeout seconds until test termination
      */
diff --git a/system-test/maxtest/src/testconnections.cc b/system-test/maxtest/src/testconnections.cc
index 69f8899f8..fbbafffea 100644
--- a/system-test/maxtest/src/testconnections.cc
+++ b/system-test/maxtest/src/testconnections.cc
@@ -727,6 +727,7 @@ void TestConnections::read_env()
         "revert_snapshot_command", "mdbci snapshot revert --path-to-nodes %s --snapshot-name ",
         m_mdbci_config_name.c_str());
     no_vm_revert = readenv_bool("no_vm_revert", true);
+    maxscale_product = readenv("maxscale_product", "maxscale_ci");
 }
 
 void TestConnections::print_env()
@@ -2268,8 +2269,11 @@ int TestConnections::process_mdbci_template()
     envvar_get_set("xpand_box", "%s", backend_box.c_str());
     envvar_get_set("target", "develop");
     envvar_get_set("vm_memory", "2048");
+    envvar_get_set("maxscale_product", "maxscale_ci");
+    envvar_get_set("force_maxscale_version", "true");
+    envvar_get_set("force_backend_version", "true");
 
-    string version = envvar_get_set("version", "10.3");
+    string version = envvar_get_set("version", "10.5");
     envvar_get_set("galera_version", "%s", version.c_str());
 
     string product = envvar_get_set("product", "mariadb");
diff --git a/system-test/mdbci/mdbci_wrapper b/system-test/mdbci/mdbci_wrapper
index 05006df2d..00a455f19 100644
--- a/system-test/mdbci/mdbci_wrapper
+++ b/system-test/mdbci/mdbci_wrapper
@@ -4,5 +4,5 @@ export host=$user@$ip 2>&1 >/dev/null
 sshopt="-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=120  "
 
 rsync  -avz  --progress -e "ssh $sshopt" ${MDBCI_VM_PATH}/ $host:${MDBCI_VM_PATH}/ 2>&1 >/dev/null
-ssh $sshopt $host "MDBCI_VM_PATH=$MDBCI_VM_PATH /home/$user/mdbci/mdbci $*" 2>/dev/null
+ssh $sshopt $host "MDBCI_VM_PATH=${MDBCI_VM_PATH} ${MDBCI_EXECUTABLE} $*" 2>/dev/null
 rsync  -avz  --progress -e "ssh $sshopt" $host:${MDBCI_VM_PATH}/ ${MDBCI_VM_PATH}/ 2>&1 >/dev/null
diff --git a/system-test/mdbci/run_test.sh b/system-test/mdbci/run_test.sh
index f81f5007e..d23a6eb9c 100755
--- a/system-test/mdbci/run_test.sh
+++ b/system-test/mdbci/run_test.sh
@@ -37,6 +37,9 @@
 # the value of $test_set after 'NAME#' is used as bash command 
 # line
 # example: '#NAME long_test_time=3600 ./long_test'
+#
+# $maxscale_product - use CI or production version of Maxscale
+# 'maxscale_ci' or 'maxscale'
 
 export vm_memory=${vm_memory:-"2048"}
 export dir=`pwd`
@@ -53,6 +56,7 @@ export mdbci_config_name=`echo ${mdbci_config_name} | sed "s/?//g"`
 
 export provider=`mdbci show provider $box --silent 2> /dev/null`
 export backend_box=${backend_box:-"centos_7_"$provider}
+export maxscale_product=${maxscale_product:-"maxscale_ci"}
 
 mdbci destroy --force ${mdbci_config_name}
 
@@ -62,6 +66,7 @@ ulimit -c unlimited
 
 cd ${script_dir}/../../
 
+rm -rf build
 mkdir build && cd build
 cmake .. -DBUILD_SYSTEM_TESTS=Y -DBUILDNAME=${mdbci_config_name} -DCMAKE_BUILD_TYPE=Debug
 cd system-test
diff --git a/system-test/mdbci/run_test_vm.sh b/system-test/mdbci/run_test_vm.sh
index 03f46b7fc..6d476fe1b 100755
--- a/system-test/mdbci/run_test_vm.sh
+++ b/system-test/mdbci/run_test_vm.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# $HOME/.config/mdbci/max-tst.key file should contain private key to access host
+
 # read the name of build scripts directory
 export script_dir="$(dirname $(readlink -f $0))"
 
@@ -10,6 +12,7 @@ export mdbci_config_name=${name:-$box-${curr_date}}
 export mdbci_config_name=`echo ${mdbci_config_name} | sed "s/?//g"`
 export MDBCI_VM_PATH=$HOME/${mdbci_config_name}_vms
 export PATH=$PATH:$HOME/mdbci
+export MDBCI_EXECUTABLE=`which mdbci`
 
 . ${script_dir}/set_run_test_variables.sh
 
@@ -57,6 +60,7 @@ test_env_list=(
     "JOB_NAME"
     "BUILD_NUMBER"
     "BUILD_TIMESTAMP"
+    "MDBCI_EXECUTABLE"
     "name"
     "target"
     "box"
@@ -77,6 +81,9 @@ test_env_list=(
     "test_branch"
     "use_valgrind"
     "use_callgrind"
+    "maxscale_product"
+    "force_maxscale_version"
+    "force_backend_version"
 )
 
 for s in ${test_env_list[@]} ; do
diff --git a/system-test/mdbci/set_run_test_variables.sh b/system-test/mdbci/set_run_test_variables.sh
index 8a1a323c3..550cfcb6e 100644
--- a/system-test/mdbci/set_run_test_variables.sh
+++ b/system-test/mdbci/set_run_test_variables.sh
@@ -13,3 +13,5 @@ export team_keys=${team_keys:-${HOME}/team_keys}
 export do_not_destroy_vm=${do_not_destroy_vm:-"yes"}
 #export test_set=${test_set:-"-LE UNSTABLE"}
 export test_set=${test_set:-"-I 1,5"}
+export force_maxscale_version=${test_set:-"true"}
+export force_backend_version=${test_set:-"false"}
diff --git a/system-test/mdbci/templates/default.json.template b/system-test/mdbci/templates/default.json.template
index 4e9e47cd6..89eab6f2a 100644
--- a/system-test/mdbci/templates/default.json.template
+++ b/system-test/mdbci/templates/default.json.template
@@ -12,7 +12,8 @@
       		"name": "${product}",
 		"version": "${version}",
                 "cnf_template" : "server1.cnf",
-                "cnf_template_path": "${cnf_path}"
+                "cnf_template_path": "${cnf_path}",
+                "force_version": ${force_backend_verion}
 	}
 
   },
@@ -30,7 +31,8 @@
                 "name": "${product}",
                 "version": "${version}",
                 "cnf_template" : "server2.cnf",
-                "cnf_template_path": "${cnf_path}"
+                "cnf_template_path": "${cnf_path}",
+                "force_version": ${force_backend_verion}
         }
   },
 
@@ -47,7 +49,8 @@
                 "name": "${product}",
                 "version": "${version}",
                 "cnf_template" : "server3.cnf",
-                "cnf_template_path": "${cnf_path}"
+                "cnf_template_path": "${cnf_path}",
+                "force_version": ${force_backend_verion}
         }
   },
 
@@ -64,7 +67,8 @@
                 "name": "${product}",
                 "version": "${version}",
                 "cnf_template" : "server4.cnf",
-                "cnf_template_path": "${cnf_path}"
+                "cnf_template_path": "${cnf_path}",
+                "force_version": ${force_backend_verion}
         }
   },
 
@@ -81,7 +85,8 @@
                 "name": "${product}",
                 "version": "${version}",
                 "cnf_template" : "server5.cnf",
-                "cnf_template_path": "${cnf_path}"
+                "cnf_template_path": "${cnf_path}",
+                "force_version": ${force_backend_verion}
         }
   },
 
@@ -98,7 +103,8 @@
                 "name": "${product}",
                 "version": "${version}",
                 "cnf_template" : "server6.cnf",
-                "cnf_template_path": "${cnf_path}"
+                "cnf_template_path": "${cnf_path}",
+                "force_version": ${force_backend_verion}
         }
   },
 
@@ -115,7 +121,8 @@
                 "name": "${product}",
                 "version": "${version}",
                 "cnf_template" : "server7.cnf",
-                "cnf_template_path": "${cnf_path}"
+                "cnf_template_path": "${cnf_path}",
+                "force_version": ${force_backend_verion}
         }
   },
 
@@ -132,7 +139,8 @@
                 "name": "${product}",
                 "version": "${version}",
                 "cnf_template" : "server8.cnf",
-                "cnf_template_path": "${cnf_path}"
+                "cnf_template_path": "${cnf_path}",
+                "force_version": ${force_backend_verion}
         }
   },
 
@@ -150,7 +158,8 @@
                 "name": "${product}",
                 "version": "${version}",
                 "cnf_template" : "server9.cnf",
-                "cnf_template_path": "${cnf_path}"
+                "cnf_template_path": "${cnf_path}",
+                "force_version": ${force_backend_verion}
         }
   },
 
@@ -167,7 +176,8 @@
                 "name": "${product}",
                 "version": "${version}",
                 "cnf_template" : "server10.cnf",
-                "cnf_template_path": "${cnf_path}"
+                "cnf_template_path": "${cnf_path}",
+                "force_version": ${force_backend_verion}
         }
   },
 
@@ -184,7 +194,8 @@
                 "name": "${product}",
                 "version": "${version}",
                 "cnf_template" : "server11.cnf",
-                "cnf_template_path": "${cnf_path}"
+                "cnf_template_path": "${cnf_path}",
+                "force_version": ${force_backend_verion}
         }
   },
 
@@ -201,7 +212,8 @@
                 "name": "${product}",
                 "version": "${version}",
                 "cnf_template" : "server12.cnf",
-                "cnf_template_path": "${cnf_path}"
+                "cnf_template_path": "${cnf_path}",
+                "force_version": ${force_backend_verion}
         }
   },
 
@@ -218,7 +230,8 @@
                 "name": "${product}",
                 "version": "${version}",
                 "cnf_template" : "server13.cnf",
-                "cnf_template_path": "${cnf_path}"
+                "cnf_template_path": "${cnf_path}",
+                "force_version": ${force_backend_verion}
         }
   },
 
@@ -235,7 +248,8 @@
                 "name": "${product}",
                 "version": "${version}",
                 "cnf_template" : "server14.cnf",
-                "cnf_template_path": "${cnf_path}"
+                "cnf_template_path": "${cnf_path}",
+                "force_version": ${force_backend_verion}
         }
   },
 
@@ -252,7 +266,8 @@
                 "name": "${product}",
                 "version": "${version}",
                 "cnf_template" : "server15.cnf",
-                "cnf_template_path": "${cnf_path}"
+                "cnf_template_path": "${cnf_path}",
+                "force_version": ${force_backend_verion}
         }
   },
 
@@ -268,7 +283,8 @@
         "products" : [
                 {
                         "name": "${product}",
-                        "version": "${version}"
+                        "version": "${version}",
+                        "force_version": ${force_backend_verion}
                 },
                 {
                         "name": "galera_config",
@@ -290,7 +306,8 @@
         "products" : [
                 {
                         "name": "${product}",
-                        "version": "${version}"
+                        "version": "${version}",
+                        "force_version": ${force_backend_verion}
                 },
                 {
                         "name": "galera_config",
@@ -312,7 +329,8 @@
         "products" : [
                 {
                         "name": "${product}",
-                        "version": "${version}"
+                        "version": "${version}",
+                        "force_version": ${force_backend_verion}
                 },
                 {
                         "name": "galera_config",
@@ -334,7 +352,8 @@
         "products" : [
                 {
                         "name": "${product}",
-                        "version": "${version}"
+                        "version": "${version}",
+                        "force_version": ${force_backend_verion}
                 },
                 {
                         "name": "galera_config",
@@ -354,8 +373,9 @@
                 "MAXSCALE"
         ],
         "product" : {
-                 "name" : "maxscale_ci",
-                "version" : "${target}"
+                "name" : "${maxscale_product}",
+                "version" : "${target}",
+                "force_version": ${force_maxscale_verion}
         }
 
   },
@@ -370,8 +390,9 @@
                 "SECOND_MAXSCALE"
         ],
         "product" : {
-                "name" : "maxscale_ci",
-                "version" : "${target}"
+                "name" : "${maxscale_product}",
+                "version" : "${target}",
+                "force_version": ${force_maxscale_verion}
         }
 
   },