diff --git a/phpci.yml b/phpci.yml
index 32e465575..f945cf6e3 100644
--- a/phpci.yml
+++ b/phpci.yml
@@ -1,22 +1,15 @@
 build_settings:
     verbose: false
     prefer_symlink: false
+    ignore:
+        - "vendor"
+        - "tests"
 
 setup:
 
 test:
     codeception:
-        config: "tests"
-    lint:
-    php_loc:
-    php_docblock_checker:
-       allowed_warnings: -1
-#    phing:
-#        build_file: 'build.xml'
-#        targets:
-#         - "deploy"
-#    php_unit:
-#        directory: "tests/phpunit/"
-#        args: "--bootstrap 'test/phpunit/bootstrap.php' --configuration 'tests/phpunit/phpunit.xml'"
+        config: "tests/codeception/"
+        path: "tests/codeception/_output/"
 
 complete:
diff --git a/tests/codeception.yml b/tests/codeception.yml
deleted file mode 100644
index f9c149984..000000000
--- a/tests/codeception.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-actor: Tester
-paths:
-    tests: codeception
-    log: codeception/_output
-    data: codeception/_data
-    helpers: codeception/_support
-settings:
-    bootstrap: _bootstrap.php
-    colors: true
-    memory_limit: 1024M
-modules:
-    config:
-        Db:
-            dsn: ''
-            user: ''
-            password: ''
-            dump: codeception/_data/dump.sql
diff --git a/tests/codeception/_output/.placeholder b/tests/codeception/_output/.placeholder
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/codeception/acceptance/AcceptanceTester.php b/tests/codeception/_support/AcceptanceTester.php
similarity index 100%
rename from tests/codeception/acceptance/AcceptanceTester.php
rename to tests/codeception/_support/AcceptanceTester.php
diff --git a/tests/codeception/unit/BasisKlasseTest.php b/tests/codeception/_support/BasisKlasseTest.php
similarity index 100%
rename from tests/codeception/unit/BasisKlasseTest.php
rename to tests/codeception/_support/BasisKlasseTest.php
diff --git a/tests/codeception/functional/FunctionalTester.php b/tests/codeception/_support/FunctionalTester.php
similarity index 100%
rename from tests/codeception/functional/FunctionalTester.php
rename to tests/codeception/_support/FunctionalTester.php
diff --git a/tests/codeception/unit/UnitTester.php b/tests/codeception/_support/UnitTester.php
similarity index 100%
rename from tests/codeception/unit/UnitTester.php
rename to tests/codeception/_support/UnitTester.php
diff --git a/tests/codeception/acceptance.suite.yml b/tests/codeception/acceptance.suite.yml
deleted file mode 100644
index 8a84881eb..000000000
--- a/tests/codeception/acceptance.suite.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Codeception Test Suite Configuration
-
-# suite for acceptance tests.
-# perform tests in browser using the WebDriver or PhpBrowser.
-# If you need both WebDriver and PHPBrowser tests - create a separate suite.
-
-class_name: AcceptanceTester
-modules:
-    enabled:
-        - PhpBrowser
-        - AcceptanceHelper
-    config:
-        PhpBrowser:
-            url: 'http://localhost/myapp/'
diff --git a/tests/codeception/codeception.dist.yml b/tests/codeception/codeception.dist.yml
new file mode 100644
index 000000000..ecf0baef5
--- /dev/null
+++ b/tests/codeception/codeception.dist.yml
@@ -0,0 +1,20 @@
+actor: Tester
+paths:
+    tests: tests
+    log: _output
+    data: _data
+    helpers: _support
+settings:
+    bootstrap: _bootstrap.php
+    colors: true
+    memory_limit: 1024M
+modules:
+    enabled:
+        - Db:
+            dsn: 'pgsql:host=localhost;port=5432;dbname=fhctest'
+            user: 'fhcomplete'
+            password: 'fhcomplete'
+            dump: _data/dump.sql
+            populate: true
+            cleanup: false
+            reconnect: false
diff --git a/tests/codeception/tests/acceptance.suite.dist.yml b/tests/codeception/tests/acceptance.suite.dist.yml
new file mode 100644
index 000000000..73a9bbf67
--- /dev/null
+++ b/tests/codeception/tests/acceptance.suite.dist.yml
@@ -0,0 +1,21 @@
+# Codeception Test Suite Configuration
+
+# suite for acceptance tests.
+# perform tests in browser using the WebDriver or PhpBrowser.
+# If you need both WebDriver and PHPBrowser tests - create a separate suite.
+
+class_name: AcceptanceTester
+modules:
+    enabled:
+        - Db
+        - PhpBrowser:
+            url: 'http://admin:1q2w3@demo.fhcomplete.org/'
+    config:
+        Db:
+            dsn: 'pgsql:host=localhost;port=5432;dbname=fhctest'
+            user: 'fhcomplete'
+            password: 'fhcomplete'
+            dump: _data/dump.sql
+            populate: true
+            cleanup: false
+            reconnect: false
diff --git a/tests/codeception/acceptance/CISLoginPageCept.php b/tests/codeception/tests/acceptance/CISLoginPageCept.php
similarity index 100%
rename from tests/codeception/acceptance/CISLoginPageCept.php
rename to tests/codeception/tests/acceptance/CISLoginPageCept.php
diff --git a/tests/codeception/acceptance/_bootstrap.php b/tests/codeception/tests/acceptance/_bootstrap.php
similarity index 100%
rename from tests/codeception/acceptance/_bootstrap.php
rename to tests/codeception/tests/acceptance/_bootstrap.php
diff --git a/tests/codeception/functional.suite.yml b/tests/codeception/tests/functional.suite.dist.yml
similarity index 85%
rename from tests/codeception/functional.suite.yml
rename to tests/codeception/tests/functional.suite.dist.yml
index 3b17a39dc..1f7d83be2 100644
--- a/tests/codeception/functional.suite.yml
+++ b/tests/codeception/tests/functional.suite.dist.yml
@@ -6,4 +6,5 @@
 
 class_name: FunctionalTester
 modules:
-    enabled: [Filesystem, FunctionalHelper]
+    enabled:
+        - Filesystem
\ No newline at end of file
diff --git a/tests/codeception/functional/_bootstrap.php b/tests/codeception/tests/functional/_bootstrap.php
similarity index 100%
rename from tests/codeception/functional/_bootstrap.php
rename to tests/codeception/tests/functional/_bootstrap.php
diff --git a/tests/codeception/unit.suite.yml b/tests/codeception/tests/unit.suite.dist.yml
similarity index 75%
rename from tests/codeception/unit.suite.yml
rename to tests/codeception/tests/unit.suite.dist.yml
index 4ffbf160e..9a79a8331 100644
--- a/tests/codeception/unit.suite.yml
+++ b/tests/codeception/tests/unit.suite.dist.yml
@@ -3,4 +3,5 @@
 # suite for unit (internal) tests.
 class_name: UnitTester
 modules:
-    enabled: [Asserts, UnitHelper]
+    enabled:
+        - Asserts
\ No newline at end of file
diff --git a/tests/codeception/unit/_bootstrap.php b/tests/codeception/tests/unit/_bootstrap.php
similarity index 100%
rename from tests/codeception/unit/_bootstrap.php
rename to tests/codeception/tests/unit/_bootstrap.php