diff --git a/csit/plans/cps/testplan.txt b/csit/plans/cps/testplan.txt
index c0cf451..c597123 100644
--- a/csit/plans/cps/testplan.txt
+++ b/csit/plans/cps/testplan.txt
@@ -20,5 +20,6 @@
 cps-admin
 cps-data
 cps-model-sync
+cps-data-sync
 ncmp-passthrough
 cm-handle-query
\ No newline at end of file
diff --git a/csit/tests/cps-data-sync/cps-data-sync.robot b/csit/tests/cps-data-sync/cps-data-sync.robot
new file mode 100644
index 0000000..d37125b
--- /dev/null
+++ b/csit/tests/cps-data-sync/cps-data-sync.robot
@@ -0,0 +1,55 @@
+/*
+ *  ============LICENSE_START=======================================================
+ *  Copyright (C) 2022 Nordix Foundation
+ *  ================================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+*** Settings ***
+Documentation         NCMP
+
+Library               Collections
+Library               OperatingSystem
+Library               RequestsLibrary
+Library               BuiltIn
+
+Suite Setup           Create Session      CPS_URL    http://${CPS_CORE_HOST}:${CPS_CORE_PORT}
+
+*** Variables ***
+
+${auth}                   Basic Y3BzdXNlcjpjcHNyMGNrcyE=
+${ncmpBasePath}           /ncmp
+
+*** Test Cases ***
+Operational state goes to UNSYNCHRONIZED when data sync (flag) is enabled
+    ${uri}=              Set Variable       ${ncmpBasePath}/v1/ch/PNFDemo/data-sync
+    ${params}=           Create Dictionary  dataSyncEnabled=true
+    ${headers}=          Create Dictionary  Authorization=${auth}
+    ${response}=         PUT On Session     CPS_URL   ${uri}   params=${params}   headers=${headers}
+    Should Be Equal As Strings              ${response.status_code}   200
+    ${verifyUri}=              Set Variable       ${ncmpBasePath}/v1/ch/PNFDemo/state
+    ${verifyHeaders}=          Create Dictionary  Authorization=${auth}
+    ${verifyResponse}=         GET On Session     CPS_URL   ${verifyUri}   headers=${verifyHeaders}
+    ${verifyResponseJson}=    Set Variable        ${verifyResponse.json()['state']['dataSyncState']['operational']}
+    Should Be Equal As Strings                    ${verifyResponseJson['syncState']}   UNSYNCHRONIZED
+    Sleep    5
+
+Operational state goes to SYNCHRONIZED after sometime when data sync (flag) is enabled
+    ${uri}=              Set Variable       ${ncmpBasePath}/v1/ch/PNFDemo/state
+    ${headers}=          Create Dictionary  Authorization=${auth}
+    ${response}=         GET On Session     CPS_URL   ${uri}   headers=${headers}
+    ${responseJson}=    Set Variable        ${response.json()['state']['dataSyncState']['operational']}
+    Should Be Equal As Strings              ${responseJson['syncState']}   SYNCHRONIZED
\ No newline at end of file
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index b7d641c..ed37f58 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -50,6 +50,7 @@
       notification.async.executor.time-out-value-in-ms: 2000
       NOTIFICATION_DATASPACE_FILTER_PATTERNS: '.*'
       TIMERS_ADVISED-MODULES-SYNC_SLEEP-TIME-MS: 2000
+      TIMERS_CM-HANDLE-DATA-SYNC_SLEEP-TIME-MS: 2000
     restart: unless-stopped
     depends_on:
       - dbpostgresql