diff --git a/jjb/aai/aai-csit.yaml b/jjb/aai/aai-csit.yaml
index 44e5739..303aa5f 100644
--- a/jjb/aai/aai-csit.yaml
+++ b/jjb/aai/aai-csit.yaml
@@ -13,5 +13,8 @@
       - 'traversal':
           trigger_jobs:
             - 'aai-traversal-{stream}-aai-docker-java-version-daily'
+      - 'esr-server':
+          trigger_jobs:
+            - 'aai-esr-server-{stream}-docker-java-daily'
     robot-options: ''
     branch: 'master'
diff --git a/jjb/aai/aai-esr-server-csit.yaml b/jjb/aai/aai-esr-server-csit.yaml
deleted file mode 100644
index 21bd5ae..0000000
--- a/jjb/aai/aai-esr-server-csit.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-esr-server-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'aai-esr-server'
-    stream: 'master'
-    functionality:
-      - 'sanity-check':
-          trigger_jobs:
-            - 'aai-esr-server-master-docker-java-daily'
-    robot-options: ''
-    branch: 'master'