diff --git a/codeception.yml b/codeception.yml
index ff367bf7b..832956818 100644
--- a/codeception.yml
+++ b/codeception.yml
@@ -1,7 +1,7 @@
 actor: Tester
 
 include:
-  - tests/*
+  - vendor/spryker/spryker/Bundles/*
 
 
 paths:
diff --git a/composer.lock b/composer.lock
index 15168effb..3e13ec78c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1200,7 +1200,7 @@
             "source": {
                 "type": "git",
                 "url": "git@github.com:spryker/spryker.git",
-                "reference": "7d7a5997bed0ef01622764a063f4cf27a6d20172"
+                "reference": "4aee7c5f08f91f23f5f926b465fd721db48fb92e"
             },
             "require": {
                 "everon/criteria-builder": "^1.1.0",
@@ -1729,7 +1729,7 @@
                 "proprietary"
             ],
             "description": "Spryker Framework",
-            "time": "2016-09-14 12:50:15"
+            "time": "2016-09-14 15:03:41"
         },
         {
             "name": "symfony-cmf/routing",
diff --git a/deploy/test/functions.sh b/deploy/test/functions.sh
deleted file mode 100644
index 7a693aac0..000000000
--- a/deploy/test/functions.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-
diff --git a/setup_test.sh b/setup_test.sh
index b6b96e202..2e4c902d7 100755
--- a/setup_test.sh
+++ b/setup_test.sh
@@ -3,6 +3,7 @@
 set -o pipefail
 
 SETUP='spryker'
+DEVELOPMENT_DATABASE_NAME='DE_development_zed'
 DATABASE_NAME='DE_test_zed'
 DATABASE_USER='development'
 DATABASE_PASSWORD='mate20mg'
@@ -40,7 +41,7 @@ function backupTestingEnvData {
 
     runCollectors
 
-    dumpDevelopmentDatabase $DATABASE_BACKUP_PATH
+    backupDevelopmentForTests
 
     successText "Backup successful."
 }
@@ -50,6 +51,13 @@ function restoreTestingEnvData {
    dropAndRestoreDatabase $DATABASE_BACKUP_PATH
 }
 
+function backupDevelopmentForTests {
+    export PGPASSWORD=$DATABASE_PASSWORD
+    export LC_ALL="en_US.UTF-8"
+
+    pg_dump -i -h 127.0.0.1 -U $DATABASE_USER  -F c -b -v -f  $DATABASE_BACKUP_PATH $DEVELOPMENT_DATABASE_NAME
+}
+
 function runCollectors() {
 
    export PGPASSWORD=$DATABASE_PASSWORD
diff --git a/tests/Acceptance/Tax/Zed/TaxRateCreateCest.php b/tests/Acceptance/Tax/Zed/TaxRateCreateCest.php
index ef6fd31bb..9150f4cf4 100644
--- a/tests/Acceptance/Tax/Zed/TaxRateCreateCest.php
+++ b/tests/Acceptance/Tax/Zed/TaxRateCreateCest.php
@@ -95,8 +95,6 @@ public function testCreateTaxRateWhichAlreadyExistsShouldShowErrorMessage(TaxRat
 
         $i->createTaxRate(TaxRateCreatePage::TAX_RATE_VALID);
         $i->see(TaxRateCreatePage::ERROR_MESSAGE_TAX_RATE_ALREADY_EXISTS);
-
-        $i->removeTaxRateFromDatabase(TaxRateCreatePage::TAX_RATE_VALID);
     }
 
     /**
@@ -116,8 +114,6 @@ public function testCreateAlreadyExistedTaxRateShouldShowErrorMessage(TaxRateTes
         $i->wait(2);
 
         $i->see(TaxRateCreatePage::ERROR_MESSAGE_TAX_RATE_ALREADY_EXISTS);
-
-        $i->removeTaxRateFromDatabase(TaxRateCreatePage::TAX_RATE_VALID);
     }
 
 }