diff --git a/enzyme/enzyme-tests.tsx b/enzyme/enzyme-tests.tsx
index 120365eab4..82a8dc9822 100644
--- a/enzyme/enzyme-tests.tsx
+++ b/enzyme/enzyme-tests.tsx
@@ -60,8 +60,8 @@ namespace ShallowWrapperTest {
 
     function test_filter() {
         shallowWrapper = shallowWrapper.filter(MyComponent);
-        statelessWrapper = shallowWrapper.filter(MyStatelessComponent);
-        shallowWrapper = shallowWrapper.filter({ prop: 'value' });
+        statelessWrapper = statelessWrapper.filter(MyStatelessComponent);
+        shallowWrapper = shallowWrapper.filter({ numberProp: 12 });
         elementWrapper = shallowWrapper.filter('.selector');
     }
 
@@ -384,8 +384,8 @@ namespace ReactWrapperTest {
 
     function test_filter() {
         reactWrapper = reactWrapper.filter(MyComponent);
-        statelessWrapper = reactWrapper.filter(MyStatelessComponent);
-        reactWrapper = reactWrapper.filter({ prop: 'myprop' });
+        statelessWrapper = statelessWrapper.filter(MyStatelessComponent);
+        reactWrapper = reactWrapper.filter({ numberProp: 12 });
         elementWrapper = reactWrapper.filter('.selector');
     }
 
diff --git a/enzyme/index.d.ts b/enzyme/index.d.ts
index 7559985e21..b939fd46d9 100644
--- a/enzyme/index.d.ts
+++ b/enzyme/index.d.ts
@@ -352,10 +352,9 @@ export interface ShallowWrapper<P, S> extends CommonWrapper<P, S> {
      * Removes nodes in the current wrapper that do not match the provided selector.
      * @param selector The selector to match.
      */
-    filter<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;
-    filter<P2>(statelessComponent: StatelessComponent<P2>): ShallowWrapper<P2, never>;
-    filter(props: EnzymePropSelector): ShallowWrapper<any, any>;
-    filter(selector: string): ShallowWrapper<HTMLAttributes, any>;
+    filter<P2>(component: ComponentClass<P2> | StatelessComponent<P2>): this;
+    filter(props: Partial<P>): this;
+    filter(selector: string): this;
 
     /**
      * Finds every node in the render tree that returns true for the provided predicate function.
@@ -459,10 +458,9 @@ export interface ReactWrapper<P, S> extends CommonWrapper<P, S> {
      * Removes nodes in the current wrapper that do not match the provided selector.
      * @param selector The selector to match.
      */
-    filter<P2>(component: ComponentClass<P2>): ReactWrapper<P2, any>;
-    filter<P2>(statelessComponent: StatelessComponent<P2>): ReactWrapper<P2, never>;
-    filter(props: EnzymePropSelector): ReactWrapper<any, any>;
-    filter(selector: string): ReactWrapper<HTMLAttributes, any>;
+    filter<P2>(component: ComponentClass<P2> | StatelessComponent<P2>): this;
+    filter(props: Partial<P>): this;
+    filter(selector: string): this;
 
     /**
      * Returns a new wrapper with all of the children of the node(s) in the current wrapper. Optionally, a selector