diff --git a/LibOneM2M/OneM2M_Pics.ttcn b/LibOneM2M/OneM2M_Pics.ttcn
index 2304e73807351e18a7143274725a9388240f9971..553717879245d0aa20d08206ea66a520e7dacc6b 100644
--- a/LibOneM2M/OneM2M_Pics.ttcn
+++ b/LibOneM2M/OneM2M_Pics.ttcn
@@ -148,6 +148,14 @@ module OneM2M_Pics {
 			modulepar boolean PICS_NON_BLOCKING_REQUEST_SYNCH := true;	
 			modulepar boolean PICS_NON_BLOCKING_REQUEST_ASYNCH := true;
 		}
+		
+		/**
+		 * @desc Subscription capabilities
+		 * @see  oneM2M TS-0017 A.5.4-1
+		 */
+		group Subscription_capabilities{
+			modulepar boolean PICS_SUBSCRIPTION_VERIFICATION := true;	
+		}
 	}
 	
 }  // end of module
diff --git a/OneM2M_TestControl_IN_profile.ttcn b/OneM2M_TestControl_IN_profile.ttcn
index eac5d94c3439e9cd9c460c75db095f03fae95beb..cf0f18c0c76ff867d43df6424b0ef2b547ac1144 100644
--- a/OneM2M_TestControl_IN_profile.ttcn
+++ b/OneM2M_TestControl_IN_profile.ttcn
@@ -368,8 +368,8 @@ module OneM2M_TestControl_IN_profile {
 		if(true) {execute (TC_CSE_SUB_DEL_001());}
 		if(true) {execute (TC_CSE_SUB_DEL_002());}
 		if(true) {execute (TC_CSE_SUB_DEL_003());}
-		if(true) {execute (TC_CSE_SUB_NTF_001());}
-		if(true) {execute (TC_CSE_SUB_NTF_002());}
+		if(PICS_SUBSCRIPTION_VERIFICATION) {execute (TC_CSE_SUB_NTF_001());}
+		if(PICS_SUBSCRIPTION_VERIFICATION) {execute (TC_CSE_SUB_NTF_002());}
 		if(true) {execute (TC_CSE_SUB_NTF_003());}
 
 		if(true) {execute (TC_CSE_SUB_CRE_004());}
diff --git a/OneM2M_TestControl_MN_profile.ttcn b/OneM2M_TestControl_MN_profile.ttcn
index 959590b1a31083ca1789962a503c84f32916226a..dd89e4f0037b3db81264bd5cb1a1735ed535eb34 100644
--- a/OneM2M_TestControl_MN_profile.ttcn
+++ b/OneM2M_TestControl_MN_profile.ttcn
@@ -375,8 +375,8 @@ module OneM2M_TestControl_MN_profile {
 		if(true) {execute (TC_CSE_SUB_DEL_001());}
 		if(true) {execute (TC_CSE_SUB_DEL_002());}
 		if(true) {execute (TC_CSE_SUB_DEL_003());}
-		if(true) {execute (TC_CSE_SUB_NTF_001());}
-		if(true) {execute (TC_CSE_SUB_NTF_002());}
+		if(PICS_SUBSCRIPTION_VERIFICATION) {execute (TC_CSE_SUB_NTF_001());}
+		if(PICS_SUBSCRIPTION_VERIFICATION) {execute (TC_CSE_SUB_NTF_002());}
 		if(true) {execute (TC_CSE_SUB_NTF_003());}
 
 		if(true) {execute (TC_CSE_SUB_CRE_004());}
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index bd867eeef398314c55e8e2a58c303fd76e3f119d..26049d433ed8f0ecbe9d1e4ca2e18820b1d25f93 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -16,6 +16,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 	import from OneM2M_Types all;//{type XSD.ID};
 	import from OneM2M_TypesAndValues all;
 	import from OneM2M_Pixits all;
+	import from OneM2M_Pics all;
 	import from LibCommon_Time all;
 	import from OneM2M_Functions all;
 	import from OneM2M_PermutationFunctions all;
@@ -2195,7 +2196,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					var integer v_ae2Index := -1;
 						
 					// Test control
-
+					if(not(PICS_SUBSCRIPTION_VERIFICATION)) {
+						setverdict(inconc, __SCOPE__ & ": Subscription verification support is required to run this test case");
+						stop;
+					}
+					
 					// Test component configuration
 					f_cf01Up(true);
 										
@@ -2270,7 +2275,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 					var integer v_ae2Index := -1;
 						
 					// Test control
-
+					if(not(PICS_SUBSCRIPTION_VERIFICATION)) {
+						setverdict(inconc, __SCOPE__ & ": Subscription verification support is required to run this test case");
+						stop;
+					}
+					
 					// Test component configuration
 					f_cf01Up(true);