diff --git a/playbooks/run_functional_job.yaml b/playbooks/run_functional_job.yaml
index e85c2eee..b5d7d238 100644
--- a/playbooks/run_functional_job.yaml
+++ b/playbooks/run_functional_job.yaml
@@ -1,7 +1,5 @@
 - hosts: all
   roles:
-    - run-devstack
-    # Run bindep and test-setup after devstack so that they won't interfere
     - role: bindep
       bindep_profile: test
       bindep_dir: "{{ zuul_work_dir }}"
diff --git a/roles/configure_functional_tests/tasks/main.yaml b/roles/configure_functional_tests/tasks/main.yaml
index 1f1bdc32..7b894d77 100644
--- a/roles/configure_functional_tests/tasks/main.yaml
+++ b/roles/configure_functional_tests/tasks/main.yaml
@@ -15,6 +15,8 @@
         STACK_USER=stack
         OVS_BRANCH={{ OVS_BRANCH }}
         OVN_BRANCH={{ OVN_BRANCH }}
+        # This is DB USER used in e.g. pgsql db
+        DATABASE_USER=openstack_citest
 
         source $DEVSTACK_PATH/functions
         source $DEVSTACK_PATH/lib/neutron_plugins/ovs_source