diff --git a/jjb/pipeline/workflow-validations.groovy b/jjb/pipeline/xos-integration-tests.groovy
similarity index 92%
rename from jjb/pipeline/workflow-validations.groovy
rename to jjb/pipeline/xos-integration-tests.groovy
index 850ae8d..abe6c4d 100644
--- a/jjb/pipeline/workflow-validations.groovy
+++ b/jjb/pipeline/xos-integration-tests.groovy
@@ -119,7 +119,7 @@
            """
       }
     }
-    stage('test data-model scale') {
+    stage('test') {
       steps {
         sh """
            #!/usr/bin/env bash
@@ -128,13 +128,7 @@
            pushd cord/test/cord-tester/src/test/cord-api/
            source setup_venv.sh
            cd Tests/XosScaleValidations
-           robot --variable xos_chameleon_url:127.0.0.1 \
-            --variable xos_chameleon_port:30006 \
-            --variable cord_kafka:\$CORD_KAFKA_IP \
-            --variable num_olts:${params.Olts} \
-            --variable num_onus:${params.Onus} \
-            --variable num_pon_ports:${params.PonPorts} \
-            xos-scale-att-workflow.robot || true
+           ${params.TestCommand} || true
            popd
 
            """
diff --git a/jjb/workflow-validations.yaml b/jjb/workflow-validations.yaml
deleted file mode 100644
index 522970b..0000000
--- a/jjb/workflow-validations.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
----
-# workflow validations job
-
-- project:
-    name: att-workflow-validations
-
-    project-name: '{name}'
-
-    jobs:
-      - 'wf-validation'
-
-- job-template:
-    id: 'wf-validation'
-    name: 'att-workflow-xos-data-model-scale-test'
-
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created by {id} job-template from ci-management/jjb/workflow-validations.yaml  <br /><br />
-      Tests run nightly for validation of particular workflows. Kafka events simulated and XOS model states validated
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: '{artifact-num-to-keep}'
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
-    parameters:
-      - string:
-         name: executorNode
-         default: 'ubuntu16.04-basebuild-4c-8g'
-         description: 'Name of the Jenkins node to run the job on'
-
-      - string:
-         name: manifestUrl
-         default: '{gerrit-server-url}/{cord-repo-manifest}'
-         description: 'URL to the repo manifest'
-
-      - string:
-         name: manifestBranch
-         default: 'master'
-         description: 'Name of the repo branch to use'
-
-      - string:
-         name: Olts
-         default: '10'
-         description: 'Number of OLTs to create'
-
-      - string:
-         name: Onus
-         default: '1'
-         description: 'Number of ONUs to create'
-
-      - string:
-         name: PonPorts
-         default: '10'
-         description: 'Number of Pon Ports'
-
-    project-type: pipeline
-    concurrent: false
-
-    dsl: !include-raw-escape: pipeline/workflow-validations.groovy
-
-    triggers:
-       - timed: |
-                 TZ=America/Los_Angeles
-                 H 0,12 * * *
diff --git a/jjb/xos-integration-tests.yaml b/jjb/xos-integration-tests.yaml
new file mode 100644
index 0000000..cee3812
--- /dev/null
+++ b/jjb/xos-integration-tests.yaml
@@ -0,0 +1,111 @@
+---
+# xos-integration test jobs
+
+- project:
+    name: data-model-scale
+
+    project-name: 'data-model-scale'
+
+    jobs:
+      - 'data-model-scale'
+      - 'data-migrations'
+
+- job-template:
+    id: 'data-model-scale'
+    name: 'xos-data-model-scale'
+
+    description: |
+      <!-- Managed by Jenkins Job Builder -->
+      Created by {id} job-template from ci-management/jjb/xos-integration-tests.yaml  <br /><br />
+
+    properties:
+      - cord-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+          artifact-num-to-keep: '{artifact-num-to-keep}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    parameters:
+      - string:
+         name: executorNode
+         default: 'ubuntu16.04-basebuild-4c-8g'
+         description: 'Name of the Jenkins node to run the job on'
+
+      - string:
+         name: manifestUrl
+         default: '{gerrit-server-url}/{cord-repo-manifest}'
+         description: 'URL to the repo manifest'
+
+      - string:
+         name: manifestBranch
+         default: 'master'
+         description: 'Name of the repo branch to use'
+
+      - string:
+         name: TestCommand
+         default: 'robot -v xos_chameleon_url:127.0.0.1 -v xos_chameleon_port:30006 -v cord_kafka:\$CORD_KAFKA_IP -v num_olts:10 -v num_onus:1 -v num_pon_ports:10 xos-scale-att-workflow.robot'
+         description: 'Exact command to execute the tests including arguments'
+
+
+    project-type: pipeline
+    concurrent: false
+
+    dsl: !include-raw-escape: pipeline/xos-integration-tests.groovy
+
+    triggers:
+       - timed: |
+                 TZ=America/Los_Angeles
+                 H 0,12 * * *
+
+- job-template:
+    id: 'data-migrations'
+    name: 'xos-data-migrations-test'
+
+    description: |
+      <!-- Managed by Jenkins Job Builder -->
+      Created by {id} job-template from ci-management/jjb/xos-integration-tests.yaml  <br /><br />
+
+    properties:
+      - cord-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+          artifact-num-to-keep: '{artifact-num-to-keep}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    parameters:
+      - string:
+         name: executorNode
+         default: 'ubuntu16.04-basebuild-4c-8g'
+         description: 'Name of the Jenkins node to run the job on'
+
+      - string:
+         name: manifestUrl
+         default: '{gerrit-server-url}/{cord-repo-manifest}'
+         description: 'URL to the repo manifest'
+
+      - string:
+         name: manifestBranch
+         default: 'master'
+         description: 'Name of the repo branch to use'
+
+      - string:
+         name: TestCommand
+         default: 'robot -d Log -T -v helm_chart:$WORKSPACE/cord/helm-charts/xos-services/simpleexampleservice xos-remove-service.robot xos-service-migrations.robot'
+         description: 'Exact command to execute the tests including arguments'
+
+
+    project-type: pipeline
+    concurrent: false
+
+    dsl: !include-raw-escape: pipeline/xos-integration-tests.groovy
+
+    triggers:
+      - reverse:
+          jobs: 'publish-imagebuilder'
+          result: 'success'