diff --git a/.gitignore b/.gitignore
index d3935bdcacc13577fbad33eae5a2fd5c8dc459ea..6e7b17ea7ad54ceb28fbd202c849b1651345987b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,7 +39,6 @@ doc/www-data.in/doc
 extra/rpm.spec
 extra/rpm/tarantool.rpm.spec
 extra/dist/tarantool.service
-extra/dist/tarantool.init
 include/tarantool/config.h
 src/trivia/config.h
 install_manifest.txt
diff --git a/.travis.yml b/.travis.yml
index e828daa083980d5f49d9a8351f3228c9369adfb7..f88669a7e42d9b0804c784e76d838210ad1350c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,7 @@ install:
 script:
   - mkdir ./build && cd ./build && cmake .. -DCMAKE_BUILD_TYPE=RelWithDebugInfo
   - make -j8
+  - make test-force
 
 notifications:
   irc:
diff --git a/debian/tarantool-common.install b/debian/tarantool-common.install
index efb24957995f5c378bbbe78b7abdd03380acb169..cbda4cc96f4842307d828ad343b346045c3a0605 100644
--- a/debian/tarantool-common.install
+++ b/debian/tarantool-common.install
@@ -1,2 +1,2 @@
-extra/dist/default.deb/tarantool /etc/default
-extra/dist/dist.lua          /usr/bin/tarantool_ctl
+/etc/default/tarantool
+/usr/bin/tarantoolctl
diff --git a/extra/dist/CMakeLists.txt b/extra/dist/CMakeLists.txt
index 6071d34bb255921fd3f5983394af9937fe43cef2..6534a5bcab6ceafd6c8b0c072cd2da5b8f5a5edb 100644
--- a/extra/dist/CMakeLists.txt
+++ b/extra/dist/CMakeLists.txt
@@ -1,14 +1,10 @@
-#
-# Scripts for a RPM package
-#
-configure_file("tarantool.init.in" "tarantool.init")
-
+# Scripts for a dist.lua packaging
 set(SYSV_INITD_PATH ${CMAKE_INSTALL_LIBDIR}/tarantool/tarantool.init)
 configure_file("tarantool.service.in" "tarantool.service")
 
 if (ENABLE_RPM)
     # chmod +x 655
-    if (SYSTEMD_FOUND AND WITH_SYSTEMD)
+    if (WITH_SYSTEMD)
     message (STATUS "Building RPM with SYSTEMD")
         install (FILES tarantool.service DESTINATION ${SYSTEMD_SERVICES_INSTALL_DIR}
             PERMISSIONS
@@ -20,7 +16,7 @@ if (ENABLE_RPM)
             OWNER_READ OWNER_WRITE
             GROUP_READ GROUP_EXECUTE
             WORLD_READ WORLD_EXECUTE)
-    else (SYSTEMD_FOUND AND WITH_SYSTEMD)
+    else (WITH_SYSTEMD)
     message (STATUS "Building RPM without SYSTEMD")
         install (FILES tarantool.init DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/init.d/
             RENAME tarantool
@@ -28,17 +24,26 @@ if (ENABLE_RPM)
             OWNER_READ OWNER_WRITE
             GROUP_READ GROUP_EXECUTE
             WORLD_READ WORLD_EXECUTE)
-    endif(SYSTEMD_FOUND AND WITH_SYSTEMD)
-    install (FILES default.rpm/tarantool DESTINATION
+    endif(WITH_SYSTEMD)
+    install (FILES default/tarantool DESTINATION
         ${CMAKE_INSTALL_SYSCONFDIR}/sysconfig/
     PERMISSIONS
     OWNER_READ OWNER_WRITE
     GROUP_READ GROUP_EXECUTE
     WORLD_READ WORLD_EXECUTE)
-    install (FILES dist.lua DESTINATION ${CMAKE_INSTALL_BINDIR}
-    RENAME tarantool_ctl
+else (ENABLE_RPM)
+    install (FILES default/tarantool DESTINATION
+        ${CMAKE_INSTALL_SYSCONFDIR}/default/
     PERMISSIONS
     OWNER_READ OWNER_WRITE
     GROUP_READ GROUP_EXECUTE
     WORLD_READ WORLD_EXECUTE)
-endif()
+endif(ENABLE_RPM)
+
+install (FILES dist.lua DESTINATION ${CMAKE_INSTALL_BINDIR}
+RENAME tarantoolctl
+PERMISSIONS
+OWNER_READ OWNER_WRITE
+GROUP_READ GROUP_EXECUTE
+WORLD_READ WORLD_EXECUTE)
+
diff --git a/extra/dist/default.rpm/tarantool b/extra/dist/default.rpm/tarantool
deleted file mode 100644
index b840cda22cfa56a021f1887a464366806d7a0703..0000000000000000000000000000000000000000
--- a/extra/dist/default.rpm/tarantool
+++ /dev/null
@@ -1,10 +0,0 @@
-# Options for Tarantool
-
-SNAPS=/var/lib/tarantool
-XLOGS=/var/lib/tarantool
-LOGS=/var/log/tarantool
-PIDS=/var/run/tarantool
-USERNAME=tarantool
-INSTDIR=/etc/tarantool/instances.enabled
-
-# vim: set ft=sh :
diff --git a/extra/dist/default.deb/tarantool b/extra/dist/default/tarantool
similarity index 100%
rename from extra/dist/default.deb/tarantool
rename to extra/dist/default/tarantool
diff --git a/extra/dist/dist.lua b/extra/dist/dist.lua
index e51f5ccbd7d1261d3768fff0d118ef1b6d32a821..b0cca1c2cab68b1e98d653b82388365fc2feb090 100755
--- a/extra/dist/dist.lua
+++ b/extra/dist/dist.lua
@@ -137,9 +137,10 @@ box.cfg = function(cfg)
     end
     local res = orig_cfg(cfg)
 
+    require('fiber').name(istance)
     log.info('Run console at %s', force_cfg_console)
     console.listen(force_cfg_console)
-    
+
     return res
 end
 
diff --git a/extra/dist/tarantool.init.in b/extra/dist/tarantool.init
similarity index 92%
rename from extra/dist/tarantool.init.in
rename to extra/dist/tarantool.init
index c6053397e4855b714c0fa2cedd175b23f66834fe..be09b2c130ae64ce6155047442804230b4dc537d 100644
--- a/extra/dist/tarantool.init.in
+++ b/extra/dist/tarantool.init
@@ -13,11 +13,11 @@
 
 # Author: Dmitry E. Oboukhov <unera@debian.org>
 
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:@CMAKE_INSTALL_BINDIR@
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:bin
 CONF_DIR=/etc/tarantool/instances.enabled
 SCRIPTNAME=/etc/init.d/tarantool
-DAEMON=@CMAKE_INSTALL_BINDIR@/tarantool
-DIST_LUA=@CMAKE_INSTALL_BINDIR@/tarantool_ctl
+DAEMON=/usr/bin/tarantool
+DIST_LUA=/usr/bin/tarantool_ctl
 
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0
diff --git a/extra/rpm/tarantool.rpm.spec.in b/extra/rpm/tarantool.rpm.spec.in
index 307ed14f1e517e27f3e5dc9136bba65e014aa7b1..f4900eb417330f86215c78d08dc3f229fef899bf 100644
--- a/extra/rpm/tarantool.rpm.spec.in
+++ b/extra/rpm/tarantool.rpm.spec.in
@@ -217,9 +217,7 @@ chown tarantool:tarantool %{_var}/log/tarantool/
 mkdir -m 0755 -p %{_var}/lib/tarantool/
 chown tarantool:tarantool %{_var}/lib/tarantool/
 mkdir -m 0755 -p %{_sysconfdir}/tarantool/instances.enabled/
-chown tarantool:tarantool %{_sysconfdir}/tarantool/instances.enabled/
 mkdir -m 0755 -p %{_sysconfdir}/tarantool/instances.available/
-chown tarantool:tarantool %{_sysconfdir}/tarantool/instances.available/
 %if %{with systemd}
 %systemd_post tarantool.service
 %else
@@ -262,7 +260,7 @@ chkconfig --del tarantool
 %endif
 
 %dir "%{_libdir}/tarantool/"
-"%{_bindir}/tarantool_ctl"
+"%{_bindir}/tarantoolctl"
 
 %files sql-module
 %defattr(-,root,root,-)