diff --git a/.travis.yml b/.travis.yml
index da381d7f..df1709a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,15 +18,7 @@ services:
 before_script:
   - .travis/$TRAVIS_OS_NAME/init.sh
   - dotnet restore
-  - docker -v
-  - docker-compose down
-  - docker-compose up -d
-  - pushd samples/docker-compose
-  - docker-compose down
-  - docker-compose up -d --build
-  - popd
 
 script:
   - dotnet build -f netcoreapp1.0 src/tarantool.client
-  - dotnet test tests/tarantool.client.tests
-  - curl -o /dev/null --fail http://localhost:5000
\ No newline at end of file
+  - .travis/$TRAVIS_OS_NAME/test.sh
\ No newline at end of file
diff --git a/.travis/linux/init.sh b/.travis/linux/init.sh
index 212c4ba2..bd7f12b3 100755
--- a/.travis/linux/init.sh
+++ b/.travis/linux/init.sh
@@ -1 +1,11 @@
-#!/usr/bin/env bash
\ No newline at end of file
+#!/usr/bin/env bash
+
+echo 'Linux init script'
+
+docker -v
+docker-compose down
+docker-compose up -d
+pushd samples/docker-compose
+docker-compose down
+docker-compose up -d --build
+popd
\ No newline at end of file
diff --git a/.travis/linux/test.sh b/.travis/linux/test.sh
new file mode 100755
index 00000000..e2d459c3
--- /dev/null
+++ b/.travis/linux/test.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+echo 'Linux test script'
+
+dotnet test tests/tarantool.client.tests
+curl -o /dev/null --fail http://localhost:5000
\ No newline at end of file
diff --git a/.travis/osx/init.sh b/.travis/osx/init.sh
index 656d0db5..8739c2bd 100755
--- a/.travis/osx/init.sh
+++ b/.travis/osx/init.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 
+echo 'Mac init script'
 brew tap caskroom/cask
 brew cask install docker
\ No newline at end of file
diff --git a/.travis/osx/test.sh b/.travis/osx/test.sh
new file mode 100755
index 00000000..e5893c5e
--- /dev/null
+++ b/.travis/osx/test.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+echo 'Mac test script'
\ No newline at end of file