diff --git a/react/react-addons-global.d.ts b/react/react-addons-global.d.ts
index cda3edcc89..508ae05225 100644
--- a/react/react-addons-global.d.ts
+++ b/react/react-addons-global.d.ts
@@ -269,7 +269,8 @@ declare module React {
     }
 
     class ShallowRenderer {
-        getRenderOutput<C extends Component<any, any>>(): C;
+        getRenderOutput<E extends ReactElement<any>>(): E;
+        getRenderOutput(): ReactElement<any>;
         render(element: ReactElement<any>, context?: any): void;
         unmount(): void;
     }
diff --git a/react/react-addons-tests.ts b/react/react-addons-tests.ts
index f67072c5f6..b07b7fd582 100644
--- a/react/react-addons-tests.ts
+++ b/react/react-addons-tests.ts
@@ -406,5 +406,5 @@ TestUtils.Simulate.keyDown(node, { key: "Enter" });
 var renderer: React.ShallowRenderer =
     TestUtils.createRenderer();
 renderer.render(React.createElement(Timer));
-var output: Timer = renderer.getRenderOutput<Timer>();
-
+var output: React.ReactElement<React.Props<Timer>> =
+    renderer.getRenderOutput();
diff --git a/react/react-addons.d.ts b/react/react-addons.d.ts
index 4ddf171522..40693cb805 100644
--- a/react/react-addons.d.ts
+++ b/react/react-addons.d.ts
@@ -1004,7 +1004,8 @@ declare module "react/addons" {
     }
 
     class ShallowRenderer {
-        getRenderOutput<C extends Component<any, any>>(): C;
+        getRenderOutput<E extends ReactElement<any>>(): E;
+        getRenderOutput(): ReactElement<any>;
         render(element: ReactElement<any>, context?: any): void;
         unmount(): void;
     }