diff --git a/tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.v1.json b/tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.v1.json
index 1db64f8..15c2045 100644
--- a/tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.v1.json
+++ b/tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.v1.json
@@ -1,5 +1,5 @@
 {
-  "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+  "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
   "policy_types": {
     "onap.policies.Monitoring": {
       "derived_from": "tosca.policies.Root",
@@ -11,11 +11,8 @@
       "version": "1.0.0",
       "properties": {
         "tca_policy": {
-          "type": "map",
-          "description": "TCA Policy JSON",
-          "entry_schema": {
-            "type": "onap.datatypes.monitoring.tca_policy"
-          }
+          "type": "onap.datatypes.monitoring.tca_policy",
+          "description": "TCA Policy JSON"
         }
       }
     }
diff --git a/tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.v2.json b/tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.v2.json
index 0076e82..a7a801a 100644
--- a/tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.v2.json
+++ b/tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.v2.json
@@ -1,16 +1,13 @@
 {
-  "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+  "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
   "policy_types": {
     "onap.policies.monitoring.cdap.tca.hi.lo.app": {
       "derived_from": "onap.policies.Monitoring",
       "version": "2.0.0",
       "properties": {
         "tca_policy": {
-          "type": "map",
-          "description": "TCA Policy JSON",
-          "entry_schema": {
-            "type": "onap.datatypes.monitoring.tca_policy"
-          }
+          "type": "onap.datatypes.monitoring.tca_policy",
+          "description": "TCA Policy JSON"
         }
       }
     }
diff --git a/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.v1.json b/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.v1.json
index 56bb18d..1079c7c 100644
--- a/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.v1.json
+++ b/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.v1.json
@@ -1,5 +1,5 @@
 {
-    "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+    "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
     "topology_template": {
         "policies": [
             {
diff --git a/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.v1_2.json b/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.v1_2.json
index a3faae4..35ad3c5 100644
--- a/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.v1_2.json
+++ b/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.v1_2.json
@@ -1,5 +1,5 @@
 {
-    "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+    "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
     "topology_template": {
         "policies": [
             {
diff --git a/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.v2.json b/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.v2.json
index 371b980..c6b2ad2 100644
--- a/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.v2.json
+++ b/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.v2.json
@@ -1,5 +1,5 @@
 {
-    "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+    "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
     "topology_template": {
         "policies": [
             {