diff --git a/tests_new/integration/non_destructive.yml b/tests_new/integration/non_destructive.yml
index 2560a2e599..d98211974d 100644
--- a/tests_new/integration/non_destructive.yml
+++ b/tests_new/integration/non_destructive.yml
@@ -25,4 +25,5 @@
     - { role: test_ignore_errors, tags: test_ignore_errors }
     - { role: test_unarchive, tags: test_unarchive }
     - { role: test_filters, tags: test_filters }
+    - { role: test_facts_d, tags: test_facts_d }
 
diff --git a/tests_new/integration/roles/test_facts_d/meta/main.yml b/tests_new/integration/roles/test_facts_d/meta/main.yml
new file mode 100644
index 0000000000..1050c23ce3
--- /dev/null
+++ b/tests_new/integration/roles/test_facts_d/meta/main.yml
@@ -0,0 +1,3 @@
+dependencies: 
+  - prepare_tests
+
diff --git a/tests_new/integration/roles/test_facts_d/tasks/main.yml b/tests_new/integration/roles/test_facts_d/tasks/main.yml
new file mode 100644
index 0000000000..93480ef775
--- /dev/null
+++ b/tests_new/integration/roles/test_facts_d/tasks/main.yml
@@ -0,0 +1,38 @@
+# Test code for facts.d and setup filters
+# (c) 2014, James Tanner <tanner.jc@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/>.
+
+- set_fact: fact_dir={{output_dir}}/facts.d
+
+- file: path={{ fact_dir }} state=directory
+- shell: echo "[general]\nbar=loaded\n" > {{ fact_dir }}/preferences.fact
+
+- setup: 
+    fact_path: "{{ fact_dir | expanduser }}"  
+    filter: "*local*"
+  register: setup_result
+
+- debug: var=setup_result  
+
+- assert:
+    that:
+        - "'ansible_facts' in setup_result"
+        - "'ansible_local' in setup_result.ansible_facts"
+        - "'preferences' in setup_result.ansible_facts['ansible_local']"
+        - "'general' in setup_result.ansible_facts['ansible_local']['preferences']"
+        - "'bar' in setup_result.ansible_facts['ansible_local']['preferences']['general']"
+        - "setup_result.ansible_facts['ansible_local']['preferences']['general']['bar'] == 'loaded'"