diff --git a/.oracle/oracle-init/00_initdb.sql b/.oracle/oracle-init/00_initdb.sql
deleted file mode 100644
index 97849d487..000000000
--- a/.oracle/oracle-init/00_initdb.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-alter database set TIME_ZONE='Europe/Oslo';
-alter database datafile 1 autoextend on maxsize 2G;
-alter system set recyclebin=OFF DEFERRED;
-alter system set processes=150 scope=spfile;
-alter system set session_cached_cursors=100 scope=spfile;
-alter system set session_max_open_files=100 scope=spfile;
-alter system set sessions=100 scope=spfile;
-alter system set license_max_sessions=100 scope=spfile;
-alter system set license_sessions_warning=100 scope=spfile;
-alter system set disk_asynch_io=FALSE scope=spfile;
-alter system set open_cursors=300 scope=both sid='*';
-alter profile default limit password_life_time unlimited;
-alter profile default limit password_verify_function null;
diff --git a/.oracle/oracle-init/01_fplos.sql b/.oracle/oracle-init/fplos.sql
similarity index 60%
rename from .oracle/oracle-init/01_fplos.sql
rename to .oracle/oracle-init/fplos.sql
index 300663f14..c5a56b547 100644
--- a/.oracle/oracle-init/01_fplos.sql
+++ b/.oracle/oracle-init/fplos.sql
@@ -7,47 +7,11 @@ BEGIN
     WHERE USERNAME = 'FPLOS';
     IF (userexists = 0)
     THEN
-        EXECUTE IMMEDIATE ('CREATE USER FPLOS IDENTIFIED BY fplos PROFILE DEFAULT ACCOUNT UNLOCK');
+        EXECUTE IMMEDIATE ('CREATE USER FPLOS IDENTIFIED BY fplos PROFILE DEFAULT ACCOUNT UNLOCK QUOTA UNLIMITED ON SYSTEM');
     END IF;
 END;
 /
 
-DECLARE
-    userexists INTEGER;
-BEGIN
-    SELECT count(*)
-    INTO userexists
-    FROM SYS.ALL_USERS
-    WHERE USERNAME = 'FPLOS_UNIT';
-    IF (userexists = 0)
-    THEN
-        EXECUTE IMMEDIATE ('CREATE USER FPLOS_UNIT IDENTIFIED BY fplos_unit PROFILE DEFAULT ACCOUNT UNLOCK');
-    END IF;
-END;
-/
-
-DECLARE
-    userexists INTEGER;
-BEGIN
-    SELECT count(*)
-    INTO userexists
-    FROM SYS.ALL_USERS
-    WHERE USERNAME = 'VL_DBA';
-    IF (userexists = 0)
-    THEN
-        EXECUTE IMMEDIATE ('CREATE USER VL_DBA IDENTIFIED BY vl_dba PROFILE DEFAULT ACCOUNT UNLOCK');
-    END IF;
-END;
-/
-
--- 1 Role for vl_dba
-GRANT DBA TO VL_DBA;
-ALTER USER VL_DBA DEFAULT ROLE ALL;
-
--- 2 System Privileges for vl_dba
-GRANT CREATE SESSION TO VL_DBA;
-GRANT UNLIMITED TABLESPACE TO VL_DBA;
-
 GRANT
     CREATE SESSION,
     ALTER SESSION,
@@ -61,7 +25,21 @@ GRANT
     CREATE SEQUENCE,
     UNLIMITED TABLESPACE,
     SELECT ANY TABLE
-TO FPLOS;
+    TO FPLOS;
+
+DECLARE
+    userexists INTEGER;
+BEGIN
+    SELECT count(*)
+    INTO userexists
+    FROM SYS.ALL_USERS
+    WHERE USERNAME = 'FPLOS_UNIT';
+    IF (userexists = 0)
+    THEN
+        EXECUTE IMMEDIATE ('CREATE USER FPLOS_UNIT IDENTIFIED BY fplos_unit PROFILE DEFAULT ACCOUNT UNLOCK QUOTA UNLIMITED ON SYSTEM');
+    END IF;
+END;
+/
 
 GRANT
     CREATE SESSION,
@@ -77,7 +55,3 @@ GRANT
     UNLIMITED TABLESPACE,
     SELECT ANY TABLE
 TO FPLOS_UNIT;
-
-ALTER USER FPLOS QUOTA UNLIMITED ON SYSTEM;
-ALTER USER FPLOS_UNIT QUOTA UNLIMITED ON SYSTEM;
-
diff --git a/src/test/resources/application-vtp.properties b/src/test/resources/application-vtp.properties
index ec7d4e653..eba6b58ff 100644
--- a/src/test/resources/application-vtp.properties
+++ b/src/test/resources/application-vtp.properties
@@ -48,4 +48,4 @@ axsys.enabled=false
 # Database
 defaultDS.username=fplos
 defaultDS.password=fplos
-defaultDS.url=jdbc:oracle:thin:@localhost:1521:XE
+defaultDS.url=jdbc:oracle:thin:@//localhost:1521/XE