diff --git a/testing/rest/src/test/resources/req/yaml/modification-replace-answer-id-1-value.yml b/testing/rest/src/test/resources/req/yaml/modification-replace-answer-id-1-value.yml
new file mode 100644
index 00000000000..6ef03406f67
--- /dev/null
+++ b/testing/rest/src/test/resources/req/yaml/modification-replace-answer-id-1-value.yml
@@ -0,0 +1,24 @@
+#
+#  ~ Copyright (c) 2010-2013 Evolveum
+#  ~
+#  ~ 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.
+#
+---
+'@ns': "http://midpoint.evolveum.com/xml/ns/public/common/api-types-3"
+objectModification: 
+  itemDelta: 
+    '@ns': "http://prism.evolveum.com/xml/ns/public/types-3"
+    modificationType: "replace"
+    path: "credentials/securityQuestions/questionAnswer[1]/questionAnswer"
+    value:
+      clearValue: "newAnswer"
\ No newline at end of file
diff --git a/testing/rest/src/test/resources/req/yaml/modification-replace-answer.yml b/testing/rest/src/test/resources/req/yaml/modification-replace-answer.yml
index 3f204decc0b..b1b93fc3785 100644
--- a/testing/rest/src/test/resources/req/yaml/modification-replace-answer.yml
+++ b/testing/rest/src/test/resources/req/yaml/modification-replace-answer.yml
@@ -19,6 +19,9 @@ objectModification:
   itemDelta: 
     '@ns': "http://prism.evolveum.com/xml/ns/public/types-3"
     modificationType: "replace"
-    path: "credentials/securityQuestions/questionAnswer[1]/questionAnswer"
+    path: "credentials/securityQuestions/questionAnswer"
     value: 
-     clearValue: "newAnswer"
\ No newline at end of file
+     '@ns': "http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+     questionIdentifier: "http://midpoint.evolveum.com/xml/ns/public/security/question-2#q001"
+     questionAnswer:
+       clearValue: "you would not believe what happens next"
\ No newline at end of file
diff --git a/testing/rest/src/test/resources/req/yaml/modification-replace-no-answer.yml b/testing/rest/src/test/resources/req/yaml/modification-replace-no-answer.yml
new file mode 100644
index 00000000000..b4fb6a363a7
--- /dev/null
+++ b/testing/rest/src/test/resources/req/yaml/modification-replace-no-answer.yml
@@ -0,0 +1,22 @@
+#
+#  ~ Copyright (c) 2010-2013 Evolveum
+#  ~
+#  ~ 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.
+#
+---
+'@ns': "http://midpoint.evolveum.com/xml/ns/public/common/api-types-3"
+objectModification: 
+  itemDelta: 
+    '@ns': "http://prism.evolveum.com/xml/ns/public/types-3"
+    modificationType: "replace"
+    path: "credentials/securityQuestions/questionAnswer"
\ No newline at end of file
diff --git a/testing/rest/src/test/resources/req/yaml/modification-replace-two-answers.yml b/testing/rest/src/test/resources/req/yaml/modification-replace-two-answers.yml
new file mode 100644
index 00000000000..f7151c65ee3
--- /dev/null
+++ b/testing/rest/src/test/resources/req/yaml/modification-replace-two-answers.yml
@@ -0,0 +1,31 @@
+#
+#  ~ Copyright (c) 2010-2013 Evolveum
+#  ~
+#  ~ 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.
+#
+---
+'@ns': "http://midpoint.evolveum.com/xml/ns/public/common/api-types-3"
+objectModification: 
+  itemDelta: 
+    '@ns': "http://prism.evolveum.com/xml/ns/public/types-3"
+    modificationType: "replace"
+    path: "credentials/securityQuestions/questionAnswer"
+    value: 
+       - '@ns': "http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+         questionIdentifier: "http://midpoint.evolveum.com/xml/ns/public/security/question-2#q001"
+         questionAnswer:
+           clearValue: "yet another answer"
+       - '@ns': "http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+         questionIdentifier: "http://midpoint.evolveum.com/xml/ns/public/security/question-2#q002"
+         questionAnswer:
+           clearValue: "42"
\ No newline at end of file