diff --git a/react/react-addons-test-utils.d.ts b/react/react-addons-test-utils.d.ts
index 3b77ac4c5..d71976ef6 100644
--- a/react/react-addons-test-utils.d.ts
+++ b/react/react-addons-test-utils.d.ts
@@ -130,19 +130,13 @@ declare namespace __React {
                 root: Component<any, any>,
                 tagName: string): Element;
 
-            export function scryRenderedComponentsWithType<P>(
+            export function scryRenderedComponentsWithType<T extends Component<{}, {}>>(
                 root: Component<any, any>,
-                type: ComponentClass<P>): Component<P, {}>[];
-            export function scryRenderedComponentsWithType<C extends Component<any, any>>(
-                root: Component<any, any>,
-                type: ComponentClass<any>): C[];
+                type: { new(): T }): T[];
 
-            export function findRenderedComponentWithType<P>(
+            export function findRenderedComponentWithType<T extends Component<{}, {}>>(
                 root: Component<any, any>,
-                type: ComponentClass<P>): Component<P, {}>;
-            export function findRenderedComponentWithType<C extends Component<any, any>>(
-                root: Component<any, any>,
-                type: ComponentClass<any>): C;
+                type: { new(): T }): T;
 
             export function createRenderer(): ShallowRenderer;
         }
diff --git a/react/react-tests.ts b/react/react-tests.ts
index aa7baa20a..9147194dc 100644
--- a/react/react-tests.ts
+++ b/react/react-tests.ts
@@ -541,6 +541,11 @@ renderer.render(React.createElement(Timer));
 var output: React.ReactElement<React.Props<Timer>> =
     renderer.getRenderOutput();
 
+var foundComponent: ModernComponent = TestUtils.findRenderedComponentWithType(
+    inst, ModernComponent);
+var foundComponents: ModernComponent[] = TestUtils.scryRenderedComponentsWithType(
+    inst, ModernComponent);
+
 //
 // TransitionGroup addon
 // --------------------------------------------------------------------------