diff --git a/docs/api/ReactWrapper/find.md b/docs/api/ReactWrapper/find.md
index 223bfa2e7..0417b5e7a 100644
--- a/docs/api/ReactWrapper/find.md
+++ b/docs/api/ReactWrapper/find.md
@@ -47,7 +47,11 @@ const wrapper = mount(<MyComponent />);
 expect(wrapper.find('Foo')).to.have.length(1);
 ```
 
-
+Object Property Selector:
+```jsx
+const wrapper = mount(<MyComponent />);
+expect(wrapper.find({prop: 'value'})).to.have.length(1);
+```
 
 #### Related Methods
 
diff --git a/docs/api/ShallowWrapper/find.md b/docs/api/ShallowWrapper/find.md
index 635602de1..85dd30579 100644
--- a/docs/api/ShallowWrapper/find.md
+++ b/docs/api/ShallowWrapper/find.md
@@ -44,6 +44,11 @@ const wrapper = shallow(<MyComponent />);
 expect(wrapper.find('Foo')).to.have.length(1);
 ```
 
+Object Property Selector:
+```jsx
+const wrapper = shallow(<MyComponent />);
+expect(wrapper.find({prop: 'value'})).to.have.length(1);
+```
 
 
 #### Related Methods
diff --git a/docs/api/selector.md b/docs/api/selector.md
index 1eb357396..5d11ae734 100644
--- a/docs/api/selector.md
+++ b/docs/api/selector.md
@@ -6,7 +6,7 @@ one of the following three categories:
 
 ### 1. A Valid CSS Selector
 
-Enzyme supports a subset of valid CSS selectors to find nodes inside a render tree. Support is as 
+Enzyme supports a subset of valid CSS selectors to find nodes inside a render tree. Support is as
 follows:
 
 - class syntax (`.foo`, `.foo-bar`, etc.)
@@ -92,6 +92,25 @@ MyComponent.displayName = 'MyComponent';
 const myComponents = wrapper.find('MyComponent');
 ```
 
-NOTE: This will *only* work if the selector (and thus the component's `displayName`) is a string 
+NOTE: This will *only* work if the selector (and thus the component's `displayName`) is a string
 starting with a capital letter. Strings starting with lower case letters will assume it is a CSS
 selector using the tag syntax.
+
+
+
+### 4. Object Property Selector
+
+Enzyme allows you to find components and nodes based on a subset of their properties:
+
+
+```jsx
+const wrapper = mount(
+  <div>
+    <span foo={3} bar={false} title="baz" />
+  </div>
+)
+
+wrapper.find({ foo: 3 })
+wrapper.find({ bar: false })
+wrapper.find({ title: 'baz'})
+```
diff --git a/src/MountedTraversal.js b/src/MountedTraversal.js
index 54bea0128..28e0a278f 100644
--- a/src/MountedTraversal.js
+++ b/src/MountedTraversal.js
@@ -1,3 +1,4 @@
+import { isArray, isNull, isMatch, isEmpty } from 'underscore';
 import {
   coercePropValue,
   nodeEqual,
@@ -177,6 +178,12 @@ export function parentsOfInst(inst, root) {
   return pathToNode(inst, root).reverse();
 }
 
+export function instHasProps(inst, props) {
+  if (!isDOMComponent(inst)) return false;
+  const node = getNode(inst);
+  return !isEmpty(props) && isMatch(propsOfNode(node), props);
+}
+
 export function buildInstPredicate(selector) {
   switch (typeof selector) {
     case 'function':
@@ -207,8 +214,14 @@ export function buildInstPredicate(selector) {
       }
       break;
 
+    case 'object':
+      if (!isArray(selector) && !isNull(selector)) {
+        return node => instHasProps(node, selector);
+      }
+      throw new TypeError('An array or null is not supported as a selector');
+
     default:
-      throw new TypeError('Expecting a string or Component Constructor');
+      throw new TypeError('Expecting a string, object, or Component Constructor');
   }
 }
 
diff --git a/src/ShallowTraversal.js b/src/ShallowTraversal.js
index e634c2d2e..ed8dc1855 100644
--- a/src/ShallowTraversal.js
+++ b/src/ShallowTraversal.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import { isArray, isNull, isMatch, isEmpty } from 'underscore';
 import {
   coercePropValue,
   propsOfNode,
@@ -95,6 +96,10 @@ export function nodeHasType(node, type) {
   return node.type.name === type || node.type.displayName === type;
 }
 
+export function nodeHasProps(node, props) {
+  return !isEmpty(props) && isMatch(propsOfNode(node), props);
+}
+
 export function buildPredicate(selector) {
   switch (typeof selector) {
     case 'function':
@@ -127,9 +132,14 @@ export function buildPredicate(selector) {
       }
       break;
 
+    case 'object':
+      if (!isArray(selector) && !isNull(selector)) {
+        return node => nodeHasProps(node, selector);
+      }
+      throw new TypeError('An array or null is not supported as a selector');
 
     default:
-      throw new TypeError('Expecting a string or Component Constructor');
+      throw new TypeError('Expecting a string, object, or Component Constructor');
   }
 }
 
diff --git a/src/__tests__/ReactWrapper-spec.js b/src/__tests__/ReactWrapper-spec.js
index 39a216318..4d550d407 100644
--- a/src/__tests__/ReactWrapper-spec.js
+++ b/src/__tests__/ReactWrapper-spec.js
@@ -261,6 +261,61 @@ describeWithDOM('mount', () => {
       expect(() => wrapper.find('.foo .foo')).to.throw(Error);
     });
 
+    it('should support object property selectors', () => {
+      const wrapper = mount(
+        <div>
+          <input data-test="ref" className="foo" type="text" />
+          <input data-test="ref" type="text"/>
+          <button data-test="ref" prop={undefined} />
+          <span data-test="ref" prop={null} />
+          <div data-test="ref" prop={123} />
+          <input data-test="ref" prop={false} />
+          <a data-test="ref" prop />
+        </div>
+      );
+      expect(wrapper.find({ a: 1 })).to.have.length(0);
+      expect(wrapper.find({ 'data-test': 'ref' })).to.have.length(7);
+      expect(wrapper.find({ className: 'foo' })).to.have.length(1);
+      expect(wrapper.find({ prop: undefined })).to.have.length(1);
+      expect(wrapper.find({ prop: null })).to.have.length(1);
+      expect(wrapper.find({ prop: 123 })).to.have.length(1);
+      expect(wrapper.find({ prop: false })).to.have.length(1);
+      expect(wrapper.find({ prop: true })).to.have.length(1);
+    });
+
+    it('should support complex object property selectors', () => {
+      const testFunction = () => {};
+      const wrapper = mount(
+        <div>
+          <span more={123} data-test="ref" prop onChange={testFunction}/>
+          <a more={123} data-test="ref" />
+        </div>
+      );
+      expect(wrapper.find({ more: 123, 'data-test': 'ref' })).to.have.length(2);
+      expect(wrapper
+        .find({ more: 123, 'data-test': 'ref', prop: true, onChange: testFunction })
+      ).to.have.length(1);
+    });
+
+    it('should not match when given empty object property selector', () => {
+      const wrapper = mount(
+        <div>
+          <input className="foo" type="text" />
+        </div>
+      );
+      expect(wrapper.find({})).to.have.length(0);
+    });
+
+    it('should throw when given null or an array', () => {
+      const wrapper = mount(
+        <div>
+          <input className="foo" type="text" />
+        </div>
+      );
+      expect(() => wrapper.find([])).to.throw(Error);
+      expect(() => wrapper.find(null)).to.throw(Error);
+    });
+
   });
 
   describe('.findWhere(predicate)', () => {
diff --git a/src/__tests__/ShallowWrapper-spec.js b/src/__tests__/ShallowWrapper-spec.js
index 66bfea323..74bd19b00 100644
--- a/src/__tests__/ShallowWrapper-spec.js
+++ b/src/__tests__/ShallowWrapper-spec.js
@@ -256,6 +256,61 @@ describe('shallow', () => {
       expect(() => wrapper.find('.foo .foo')).to.throw(Error);
     });
 
+    it('should support object property selectors', () => {
+      const wrapper = shallow(
+        <div>
+          <input data-test="ref" className="foo" type="text" />
+          <input data-test="ref" type="text"/>
+          <button data-test="ref" prop={undefined} />
+          <span data-test="ref" prop={null} />
+          <div data-test="ref" prop={123} />
+          <input data-test="ref" prop={false} />
+          <a data-test="ref" prop />
+        </div>
+      );
+      expect(wrapper.find({ a: 1 })).to.have.length(0);
+      expect(wrapper.find({ 'data-test': 'ref' })).to.have.length(7);
+      expect(wrapper.find({ className: 'foo' })).to.have.length(1);
+      expect(wrapper.find({ prop: undefined })).to.have.length(1);
+      expect(wrapper.find({ prop: null })).to.have.length(1);
+      expect(wrapper.find({ prop: 123 })).to.have.length(1);
+      expect(wrapper.find({ prop: false })).to.have.length(1);
+      expect(wrapper.find({ prop: true })).to.have.length(1);
+    });
+
+    it('should support complex object property selectors', () => {
+      const testFunction = () => {};
+      const wrapper = shallow(
+        <div>
+          <span more={123} data-test="ref" prop onChange={testFunction}/>
+          <a more={123} data-test="ref" />
+        </div>
+      );
+      expect(wrapper.find({ more: 123, 'data-test': 'ref' })).to.have.length(2);
+      expect(wrapper
+        .find({ more: 123, 'data-test': 'ref', prop: true, onChange: testFunction })
+      ).to.have.length(1);
+    });
+
+    it('should not match when given empty object property selector', () => {
+      const wrapper = shallow(
+        <div>
+          <input className="foo" type="text" />
+        </div>
+      );
+      expect(wrapper.find({})).to.have.length(0);
+    });
+
+    it('should throw when given null or an array', () => {
+      const wrapper = shallow(
+        <div>
+          <input className="foo" type="text" />
+        </div>
+      );
+      expect(() => wrapper.find([])).to.throw(Error);
+      expect(() => wrapper.find(null)).to.throw(Error);
+    });
+
   });
 
   describe('.findWhere(predicate)', () => {