diff --git a/BUILD/build_deb_local.sh b/BUILD/build_deb_local.sh
new file mode 100755
index 000000000..e176153b9
--- /dev/null
+++ b/BUILD/build_deb_local.sh
@@ -0,0 +1,84 @@
+#!/bin/bash 
+
+# do the real building work
+# this script is executed on build VM
+
+set -x
+
+cd ./MaxScale
+
+
+mkdir _build
+cd _build
+cmake ..  $cmake_flags 
+export LD_LIBRARY_PATH=$PWD/log_manager:$PWD/query_classifier
+make
+
+export LD_LIBRARY_PATH=$(for i in `find $PWD/ -name '*.so*'`; do echo $(dirname $i); done|sort|uniq|xargs|sed -e 's/[[:space:]]/:/g')
+make package
+res=$?
+if [ $res != 0 ] ; then
+        echo "Make package failed"
+        exit $res
+fi
+
+sudo rm ../CMakeCache.txt
+sudo rm CMakeCache.txt
+
+echo "Building tarball..."
+cmake .. $cmake_flags -DTARBALL=Y 
+sudo make package
+
+
+cp _CPack_Packages/Linux/DEB/*.deb ../
+
+rm ../CMakeCache.txt
+rm CMakeCache.txt
+cd ..
+cp _build/*.deb .
+cp *.deb ..
+cp _build/*.gz .
+
+set -x
+if [ "$build_experimental" == "yes" ] ; then
+        rm -rf _bild
+	mkdir _build
+	cd _build
+	export LD_LIBRARY_PATH=""
+	cmake ..  $cmake_flags -DTARGET_COMPONENT=experimental
+	export LD_LIBRARY_PATH=$(for i in `find $PWD/ -name '*.so*'`; do echo $(dirname $i); done|sort|uniq|xargs|sed -e 's/[[:space:]]/:/g')
+	make package
+	cp _CPack_Packages/Linux/DEB/*.deb ../
+        cd ..
+        cp _build/*.deb .
+        cp *.deb ..
+	cp _build/*.gz .
+
+        rm -rf _bild
+        mkdir _build
+        cd _build
+        export LD_LIBRARY_PATH=""
+        cmake ..  $cmake_flags -DTARGET_COMPONENT=devel
+        export LD_LIBRARY_PATH=$(for i in `find $PWD/ -name '*.so*'`; do echo $(dirname $i); done|sort|uniq|xargs|sed -e 's/[[:space:]]/:/g')
+        make package
+	cp _CPack_Packages/Linux/DEB/*.deb ../
+        cd ..
+        cp _build/*.deb .
+        cp *.deb ..
+	cp _build/*.gz .
+fi
+
+if [ "$BUILD_RABBITMQ" == "yes" ] ; then
+  cmake ../rabbitmq_consumer/  $cmake_flags 
+  sudo make package
+  res=$?
+  if [ $res != 0 ] ; then
+        exit $res
+  fi
+  cp _CPack_Packages/Linux/DEB/*.deb ../
+  cd ..
+  cp _build/*.deb .
+  cp *.deb ..
+fi
+sudo dpkg -i ../maxscale*.dev
+set +x
diff --git a/BUILD/build_rpm_local.sh b/BUILD/build_rpm_local.sh
new file mode 100755
index 000000000..9f6a29428
--- /dev/null
+++ b/BUILD/build_rpm_local.sh
@@ -0,0 +1,70 @@
+#!/bin/bash 
+
+# do the real building work
+# this script is executed on build VM
+
+set -x
+
+cd ./MaxScale
+
+mkdir _build
+cd _build
+cmake ..  $cmake_flags 
+make
+
+if [ $remove_strip == "yes" ] ; then
+	sudo rm -rf /usr/bin/strip
+	sudo touch /usr/bin/strip
+	sudo chmod a+x /usr/bin/strip
+fi 
+sudo make package
+res=$?
+if [ $res != 0 ] ; then
+	echo "Make package failed"
+	exit $res
+fi
+
+sudo rm ../CMakeCache.txt
+sudo rm CMakeCache.txt
+
+echo "Building tarball..."
+cmake .. $cmake_flags -DTARBALL=Y
+sudo make package
+
+cd ..
+cp _build/*.rpm .
+cp _build/*.gz .
+
+if [ "$build_experimental" == "yes" ] ; then
+        sudo rm -rf _build
+        mkdir _build
+        cd _build
+        cmake ..  $cmake_flags -DTARGET_COMPONENT=experimental
+        sudo make package
+        cd ..
+        cp _build/*.rpm .
+	cp _build/*.gz .
+
+        sudo rm -rf _build
+        mkdir _build
+        cd _build
+        cmake ..  $cmake_flags -DTARGET_COMPONENT=devel
+        sudo make package
+        cd ..
+        cp _build/*.rpm .
+	cp _build/*.gz .
+fi
+
+if [ "$BUILD_RABBITMQ" == "yes" ] ; then
+  cmake ../rabbitmq_consumer/  $cmake_flags 
+  sudo make package
+  res=$?
+  if [ $res != 0 ] ; then
+        exit $res
+  fi
+  cd ..
+  cp _build/*.rpm .
+  cp _build/*.gz .
+fi
+
+sudo rpm -i maxscale*.rpm
diff --git a/BUILD/run_test.sh b/BUILD/run_test.sh
new file mode 100644
index 000000000..57ea40d3b
--- /dev/null
+++ b/BUILD/run_test.sh
@@ -0,0 +1,6 @@
+cd ~/Maxscale/maxscale-system-test
+
+cmake .
+make
+
+ctest -LE HEAVY -VV