diff --git a/.travis.yml b/.travis.yml
index 009b777..8845123 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,15 +42,13 @@ matrix:
           packages:
             - g++-5
       before_install:
-        - sudo add-apt-repository -y "deb http://ppa.launchpad.net/grilo-team/travis/ubuntu trusty main"
-        - sudo add-apt-repository -y "deb http://ppa.launchpad.net/fkrull/deadsnakes/ubuntu trusty main"
-        - sudo apt-get update -qq
+        - pip install hererocks --user
+        - hererocks lua53 -l5.3 -rlatest
+        - source lua53/bin/activate
       install:
-        - sudo apt-get install -qq --force-yes lua5.3 liblua5.3-dev
         - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 1
-        - sudo update-alternatives --install /usr/bin/lua lua /usr/bin/lua5.3 1
       script:
-        - ci/test_all.sh -DLUA_INCLUDE_DIR="/usr/include/lua5.3" -DLUA_LIBRARY="/usr/lib/x86_64-linux-gnu/liblua5.3.so"
+        - ci/test_all.sh -DLUA_INCLUDE_DIR="$PWD/lua53/include"
     - os: linux
       env: LUA=LuaJIT
       addons:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b1d0a8..affe42e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release")
 endif(NOT CMAKE_BUILD_TYPE)
 
-if (NOT (LUA_INCLUDE_DIR AND LUA_LIBRARY OR BUILD_ROCK))
+if (NOT (LUA_INCLUDE_DIR OR BUILD_ROCK))
     find_package(Lua REQUIRED)
 endif()
 
diff --git a/tests/lua/channel-stress.lua b/tests/lua/channel-stress.lua
index 18a2e49..fe26da0 100644
--- a/tests/lua/channel-stress.lua
+++ b/tests/lua/channel-stress.lua
@@ -5,7 +5,7 @@ test.channel_stress.tear_down = default_tear_down
 test.channel_stress.with_multiple_threads = function ()
     local exchange_channel, result_channel = effil.channel(), effil.channel()
 
-    local threads_number = 1000
+    local threads_number = 20
     local threads = {}
     for i = 1, threads_number do
         threads[i] = effil.thread(function(exchange_channel, result_channel, indx)