diff --git a/types/storybook__addon-info/index.d.ts b/types/storybook__addon-info/index.d.ts
index 111f7dc54d..a6c463f5d9 100644
--- a/types/storybook__addon-info/index.d.ts
+++ b/types/storybook__addon-info/index.d.ts
@@ -6,7 +6,7 @@
 // TypeScript Version: 2.8
 
 import * as React from 'react';
-import { RenderFunction } from '@storybook/react';
+import { RenderFunction, StoryDecorator } from '@storybook/react';
 
 export interface WrapStoryProps {
   storyFn?: RenderFunction;
@@ -29,6 +29,10 @@ export interface Options {
   maxPropStringLength?: number;
 }
 
+// TODO: it would be better to use type inference for the parameters
+// type DecoratorParams = StoryDecorator extends (...a: infer A) => any ? A: never;
+export function withInfo(story: RenderFunction, context: { kind: string, story: string }): ReturnType<StoryDecorator>;
+// Legacy, but supported
 export function withInfo(textOrOptions?: string | Options): (storyFn: RenderFunction) => (context?: object) => React.ReactElement<WrapStoryProps>;
 
 export function setDefaults(newDefaults: Options): Options;
diff --git a/types/storybook__addon-info/storybook__addon-info-tests.tsx b/types/storybook__addon-info/storybook__addon-info-tests.tsx
index 46fd799314..505780bf7e 100644
--- a/types/storybook__addon-info/storybook__addon-info-tests.tsx
+++ b/types/storybook__addon-info/storybook__addon-info-tests.tsx
@@ -1,11 +1,13 @@
 /// <reference types="storybook__react" />
 
 import * as React from 'react';
-import { storiesOf } from '@storybook/react';
+import { addDecorator, storiesOf } from '@storybook/react';
 import { setDefaults, withInfo } from '@storybook/addon-info';
 
 const { Component } = React;
 
+addDecorator(withInfo);
+
 setDefaults({
     inline: false,
     propTables: false