diff --git a/test/feature/FAB-3505.feature b/test/feature/FAB-3505.feature
new file mode 100644
index 00000000000..5c962c2a1fd
--- /dev/null
+++ b/test/feature/FAB-3505.feature
@@ -0,0 +1,40 @@
+#Copyright IBM Corp. 2017 All Rights Reserved.
+#
+# 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.
+#
+
+Feature: FAB-3505 Test chaincode_example02
+    As a user I want to run chaincode example02
+
+Scenario Outline: Test chaincode example02 deploy
+  Given I have a bootstrapped fabric network of type <type>
+  When a user deploys chaincode at path "github.com/hyperledger/fabric/chaincode_example02" with ["init", "a", "1000" , "b", "2000"] with name "mycc"
+  Then the chaincode is deployed
+  When a user queries on the chaincode named "mycc" with args ["query", "a"]
+  Then a user receives expected response is 1000
+  When a user invokes on the chaincode named "mycc" with args ["txId1", "invoke", "a", 10]
+  When a user queries on the chaincode named "mycc" with args ["query", "a"]
+  Then a user receives expected response is 990
+
+  Given "Peer1" is taken down
+  When a user invokes on the chaincode named "mycc" with args ["txId1", "invoke", "a", 10]
+  And I wait "15" seconds
+  And "Peer1" comes back up
+  When a user queries on the chaincode named "mycc" with args ["query", "a"] on "Peer1"
+  Then a user receives expected response is 980
+
+
+  Examples:
+    | type  |
+    | solo  |
+    | kafka |