diff --git a/.travis.yml b/.travis.yml
index 7ae132e..3c01d8d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,14 +3,15 @@ language: c
 env:
   - LUA="Lua 5.1"
   - LUA="Lua 5.2"
+  - LUA="Lua 5.3"
   - LUA="LuaJIT 2.0"
 
 before_install:
   - bash .travis_setup.sh
+  - bash .travis_setup_rocks.sh
 
 install:
-  - sudo luarocks make rockspecs/argparse-scm-1.rockspec
-  - sudo luarocks install busted
+  - sudo luarocks make
 
 script:
   - busted spec
diff --git a/.travis_setup.sh b/.travis_setup.sh
index a8a8d9b..130a7a0 100644
--- a/.travis_setup.sh
+++ b/.travis_setup.sh
@@ -1,25 +1,37 @@
-# A script for setting up environment for travis-ci testing. 
-# Sets up Lua and Luarocks. 
-# LUA must be "Lua 5.1", "Lua 5.2" or "LuaJIT 2.0". 
+# A script for setting up environment for travis-ci testing.
+# Sets up Lua and Luarocks.
+# LUA must be "Lua 5.1", "Lua 5.2", "Lua 5.3" or "LuaJIT 2.0".
+
+set -e
 
 if [ "$LUA" == "LuaJIT 2.0" ]; then
-  curl http://luajit.org/download/LuaJIT-2.0.2.tar.gz | tar xz
-  cd LuaJIT-2.0.2
+  wget -O - http://luajit.org/download/LuaJIT-2.0.3.tar.gz | tar xz
+  cd LuaJIT-2.0.3
   make && sudo make install INSTALL_TSYMNAME=lua;
 else
   if [ "$LUA" == "Lua 5.1" ]; then
-    curl http://www.lua.org/ftp/lua-5.1.5.tar.gz | tar xz
+    wget -O - http://www.lua.org/ftp/lua-5.1.5.tar.gz | tar xz
     cd lua-5.1.5;
   elif [ "$LUA" == "Lua 5.2" ]; then
-    curl http://www.lua.org/ftp/lua-5.2.3.tar.gz | tar xz
-    cd lua-5.2.3;
+    wget -O - http://www.lua.org/ftp/lua-5.2.4.tar.gz | tar xz
+    cd lua-5.2.4;
+  elif [ "$LUA" == "Lua 5.3" ]; then
+    wget -O - http://www.lua.org/ftp/lua-5.3.0.tar.gz | tar xz
+    cd lua-5.3.0;
   fi
   sudo make linux install;
 fi
 
 cd ..
-curl http://luarocks.org/releases/luarocks-2.1.2.tar.gz | tar xz
-cd luarocks-2.1.2
+
+if [ "$LUA" == "Lua 5.3" ]; then
+  git clone https://github.com/keplerproject/luarocks
+  cd luarocks
+  git checkout 0f1c93774669468c5165be2711325224388aed41;
+else
+  wget -O - http://luarocks.org/releases/luarocks-2.2.0.tar.gz | tar xz
+  cd luarocks-2.2.0;
+fi
 
 if [ "$LUA" == "LuaJIT 2.0" ]; then
   ./configure --with-lua-include=/usr/local/include/luajit-2.0;
diff --git a/.travis_setup_rocks.sh b/.travis_setup_rocks.sh
new file mode 100644
index 0000000..ea23dd5
--- /dev/null
+++ b/.travis_setup_rocks.sh
@@ -0,0 +1,8 @@
+# A script for setting up broken Lua rocks for travis-ci testing.
+
+sudo luarocks install dkjson --deps-mode=none
+
+git clone https://github.com/Olivine-Labs/busted
+cd busted
+sudo luarocks make busted-scm-0.rockspec
+cd ..
diff --git a/rockspecs/argparse-scm-1.rockspec b/argparse-scm-1.rockspec
similarity index 100%
rename from rockspecs/argparse-scm-1.rockspec
rename to argparse-scm-1.rockspec