diff --git a/test/integration/non_destructive.yml b/test/integration/non_destructive.yml
index 4c2178ca20..7dc17e7638 100644
--- a/test/integration/non_destructive.yml
+++ b/test/integration/non_destructive.yml
@@ -33,3 +33,4 @@
     - { role: test_lookups, tags: test_lookups }
     - { role: test_iterators, tags: test_iterators }
     - { role: test_command_shell, tags: test_command_shell }
+    - { role: test_failed_when, tags: test_failed_when }
\ No newline at end of file
diff --git a/test/integration/roles/test_failed_when/tasks/main.yml b/test/integration/roles/test_failed_when/tasks/main.yml
new file mode 100644
index 0000000000..3492422e43
--- /dev/null
+++ b/test/integration/roles/test_failed_when/tasks/main.yml
@@ -0,0 +1,28 @@
+# Test code for failed_when.
+# (c) 2014, Richard Isaacson <richard.c.isaacson@gmail.com>
+
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+- name: Test failed_when behavior but catch it.
+  command: /bin/true
+  failed_when: 2 != 3
+  register: failed
+  ignore_errors: True
+
+- name: Assert that failed_when is true.
+  assert:
+    that:
+      - "failed.failed_when_result == True"
\ No newline at end of file