diff --git a/script/setup b/script/setup
index 64bec13d4f..d0c84566dc 100755
--- a/script/setup
+++ b/script/setup
@@ -30,14 +30,8 @@ fi
 # Install used Bundler version
 ./script/install-bundler
 
-# Install all dependencies
-bundle check || bundle install
-yarn install
-
-# Set up the database for both development and test
-# Confirming the default user and password
-printf '\n\n' | bundle exec rake db:setup db:test:prepare
-printf '\n'
+# Install dependencies, prepare database and tidy
+./bin/setup
 
 # Load some default data for your environment
 bundle exec rake ofn:sample_data