diff --git a/.travis.yml b/.travis.yml
index 8704cac..54ea105 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: c
 
 env:
   global:
-    - LUAROCKS=2.2.0beta1
+    - LUAROCKS=2.2.1
   matrix:
     # You can set PERF only for luajit/ffi
     # todo: install libffi and test ffi binding on Lua 5.1/5.2
@@ -41,11 +41,11 @@ before_install:
 
 install:
   - sudo pip install cpp-coveralls
-  - sudo luarocks install luafilesystem --from=https://rocks.moonscript.org/dev
-  - sudo luarocks install lua-path --deps-mode=none
+  - sudo luarocks install luafilesystem
+  - sudo luarocks install lua-path
   - sudo luarocks install luacov-coveralls
-  - sudo luarocks install lua-llthreads2 --server=http://rocks.moonscript.org/dev
-  - sudo luarocks install https://raw.github.com/moteus/lunit/moteus-skip/rockspecs/lunitx-scm.mot.skip-0.rockspec
+  - sudo luarocks install lua-llthreads2
+  - sudo luarocks install lunitx
 
   - if [ $LZMQ = "ffi-lua" ]; then
       sudo luarocks install ljsyscall 0.9;
diff --git a/.travis/platform.sh b/.travis/platform.sh
index 4a3af0d..7259a7d 100644
--- a/.travis/platform.sh
+++ b/.travis/platform.sh
@@ -1,4 +1,4 @@
-if [ -z "$PLATFORM" ]; then
+if [ -z "${PLATFORM:-}" ]; then
   PLATFORM=$TRAVIS_OS_NAME;
 fi
 
diff --git a/.travis/setup_lua.sh b/.travis/setup_lua.sh
index e37d6cf..2fe2745 100644
--- a/.travis/setup_lua.sh
+++ b/.travis/setup_lua.sh
@@ -6,10 +6,17 @@
 # luajit2.0 - master v2.0
 # luajit2.1 - master v2.1
 
+set -eufo pipefail
+
 LUAJIT_BASE="LuaJIT-2.0.3"
 
 source .travis/platform.sh
 
+echo "==============================="
+echo " Platform : $PLATFORM          "
+echo "==============================="
+echo 
+
 LUAJIT="no"
 
 if [ "$PLATFORM" == "macosx" ]; then
@@ -54,8 +61,8 @@ else
     curl http://www.lua.org/ftp/lua-5.1.5.tar.gz | tar xz
     cd lua-5.1.5;
   elif [ "$LUA" == "lua5.2" ]; then
-    curl http://www.lua.org/ftp/lua-5.2.3.tar.gz | tar xz
-    cd lua-5.2.3;
+    curl http://www.lua.org/ftp/lua-5.2.4.tar.gz | tar xz
+    cd lua-5.2.4;
   elif [ "$LUA" == "lua5.3" ]; then
     curl http://www.lua.org/ftp/lua-5.3.0.tar.gz | tar xz
     cd lua-5.3.0;
@@ -95,7 +102,7 @@ if [ "$LUAJIT" == "yes" ]; then
 elif [ "$LUA" == "lua5.1" ]; then
   rm -rf lua-5.1.5;
 elif [ "$LUA" == "lua5.2" ]; then
-  rm -rf lua-5.2.3;
+  rm -rf lua-5.2.4;
 elif [ "$LUA" == "lua5.3" ]; then
   rm -rf lua-5.3.0;
 fi
diff --git a/.travis/setup_sodium.sh b/.travis/setup_sodium.sh
index 7c34456..d19e6ad 100644
--- a/.travis/setup_sodium.sh
+++ b/.travis/setup_sodium.sh
@@ -1,5 +1,7 @@
 # PLATFORM must be "linux" or "macosx"
 
+set -eufo pipefail
+
 git clone git://github.com/jedisct1/libsodium.git
 cd libsodium
 ./autogen.sh
diff --git a/.travis/setup_zmq.sh b/.travis/setup_zmq.sh
index de93f06..8731283 100644
--- a/.travis/setup_zmq.sh
+++ b/.travis/setup_zmq.sh
@@ -1,10 +1,7 @@
 
-source .travis/platform.sh
+set -eufo pipefail
 
-echo "==============================="
-echo " Platform : $PLATFORM          "
-echo "==============================="
-echo 
+source .travis/platform.sh
 
 if [ "$PLATFORM" == "linux" ]; then
   sudo apt-get remove libzmq3;