diff --git a/lib/ansible/inventory/dir.py b/lib/ansible/inventory/dir.py
index 53a6349fc76..e3eda226958 100644
--- a/lib/ansible/inventory/dir.py
+++ b/lib/ansible/inventory/dir.py
@@ -36,13 +36,12 @@ class InventoryDirectory(object):
         self.parsers = []
         self.hosts = {}
         self.groups = {}
- 
+
         for i in self.names:
 
             # Skip files that end with certain extensions or characters
-            for ext in ("~", ".orig", ".bak", ".ini", ".retry", ".pyc", ".pyo"):
-                if i.endswith(ext):
-                    continue
+            if any(i.endswith(ext) for ext in ("~", ".orig", ".bak", ".ini", ".retry", ".pyc", ".pyo")):
+                continue
             # Skip hidden files
             if i.startswith('.') and not i.startswith('./'):
                 continue
diff --git a/test/units/TestInventory.py b/test/units/TestInventory.py
index 4aae739a233..e8f85adbd4a 100644
--- a/test/units/TestInventory.py
+++ b/test/units/TestInventory.py
@@ -439,3 +439,7 @@ class TestInventory(unittest.TestCase):
         actual_host_names = [host.name for host in group_greek]
         print "greek : %s " % actual_host_names
         assert actual_host_names == ['zeus', 'morpheus']
+
+    def test_dir_inventory_skip_extension(self):
+        inventory = self.dir_inventory()
+        assert 'skipme' not in [h.name for h in inventory.get_hosts()]
diff --git a/test/units/inventory_test_data/inventory_dir/4skip_extensions.ini b/test/units/inventory_test_data/inventory_dir/4skip_extensions.ini
new file mode 100644
index 00000000000..a30afe5fccd
--- /dev/null
+++ b/test/units/inventory_test_data/inventory_dir/4skip_extensions.ini
@@ -0,0 +1,2 @@
+[skip]
+skipme
\ No newline at end of file