diff --git a/.gitignore b/.gitignore
index 51b973de7..7fdf62e73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ documents/
 .settings
 .project
 .buildpath
+application/config/development/
 tests/codeception/codeception.yml
 tests/codeception/tests/api.suite.yml
 tests/codeception/tests/functional.suite.yml
@@ -19,4 +20,4 @@ tests/codeception/_output/*
 /submodules/d3
 composer.lock
 bin
-/tests/codeception/api.suite.yml
\ No newline at end of file
+/tests/codeception/api.suite.yml
diff --git a/application/config/config.php b/application/config/config.php
index 68b85b62f..79b6d5dca 100755
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -17,7 +17,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 | environments.
 |
 */
-$config['base_url'] = 'http://localhost/fhcomplete/';
+$config['base_url'] = 'http://phpci.fhcomplete.org/build/fhcomplete/';
 
 /*
 |--------------------------------------------------------------------------
diff --git a/install.sh b/install.sh
index 5d639aae8..8077d2467 100755
--- a/install.sh
+++ b/install.sh
@@ -53,6 +53,8 @@ echo "Database ..."
 #sudo -u postgres psql template1 -c 'DROP DATABASE IF EXISTS fhctest;'
 #echo "Database fhctest dropped!"
 sudo -u postgres createdb -O fhcomplete fhctest
+sudo -u postgres psql fhctest -c 'CREATE SCHEMA IF NOT EXISTS system;'
+sudo -u postgres psql fhctest -c 'ALTER SCHEMA system OWNER TO fhcomplete;'
 
 echo "Installing FH-Complete..."
 # cp index.ci.php index.php		# Maybe somtimes
diff --git a/phpci.yml b/phpci.yml
index 4c4479c51..9d0a33606 100644
--- a/phpci.yml
+++ b/phpci.yml
@@ -22,8 +22,8 @@ setup:
 #        - "pkill -f fhctest &"
 #        - "sudo -u postgres psql fhctest -c 'DROP DATABASE IF EXISTS fhctest;'"
         - "cd %BUILD_PATH% && chmod u+x install.sh && ./install.sh fhctest" # Install Database
-        - "rm -f /var/www/html/build" # SymLink löschen falls vorhanden
-        - "ln -s %BUILD_PATH% /var/www/html/build" # SymLink to the actual build
+        - "rm -f /var/www/html/build/fhcomplete" # SymLink löschen falls vorhanden
+        - "ln -s %BUILD_PATH% /var/www/html/build/fhcomplete" # SymLink to the actual build
 #        - "php index.ci.php DBTools migrate" # DB-Migration
 
 test:
diff --git a/tests/codeception/tests/acceptance.suite.dist.yml b/tests/codeception/tests/acceptance.suite.dist.yml
index 3ca32aed8..4199cc497 100644
--- a/tests/codeception/tests/acceptance.suite.dist.yml
+++ b/tests/codeception/tests/acceptance.suite.dist.yml
@@ -12,7 +12,7 @@ modules:
         - Db
     config:
         PhpBrowser:
-            url: 'http://admin:1q2w3@localhost/build/'
+            url: 'http://admin:1q2w3@localhost/build/fhcomplete/'
         Db:
             dsn: 'pgsql:host=localhost;port=5432;dbname=fhctest'
             user: 'fhcomplete'
diff --git a/tests/codeception/tests/api.suite.dist.yml b/tests/codeception/tests/api.suite.dist.yml
index b156918a2..a0b3cc3c9 100644
--- a/tests/codeception/tests/api.suite.dist.yml
+++ b/tests/codeception/tests/api.suite.dist.yml
@@ -5,7 +5,7 @@ modules:
         - Db
         - REST:
             # API URL
-            url: http://localhost/build/index.ci.php/api/
+            url: http://localhost/build/fhcomplete/index.ci.php/api/
             # Can also be a framework module name
             depends: PhpBrowser
             # Limits PhpBrowser to JSON or XML