diff --git a/react/react-addons-tests.ts b/react/react-addons-tests.ts
index 059769bb9..7ce0fa23f 100644
--- a/react/react-addons-tests.ts
+++ b/react/react-addons-tests.ts
@@ -1,7 +1,36 @@
 /// <reference path="react.d.ts" />
 import React = require("react/addons");
 
-// TestUtils
+var isImportant: boolean;
+var isRead: boolean;
+var classSet: React.ClassSet = {
+    "message": true,
+    "message-important": isImportant,
+    "message-read": isRead
+};
+var cx = React.addons.classSet;
+var classes: string = cx(classSet);
+
+//
+// React.addons (Transitions)
+// --------------------------------------------------------------------------
+
+React.createFactory(React.addons.TransitionGroup)({ component: "div" });
+React.createFactory(React.addons.CSSTransitionGroup)({
+    component: React.createClass({
+        render: (): React.ReactElement<any> => null
+    }),
+    childFactory: (c) => c,
+    transitionName: "transition",
+    transitionAppear: false,
+    transitionEnter: true,
+    transitionLeave: true
+});
+
+//
+// React.addons.TestUtils
+// --------------------------------------------------------------------------
+
 var that: React.CompositeComponent<any, any>;
 var node = that.refs["input"].getDOMNode();
 React.addons.TestUtils.Simulate.click(node);
@@ -16,27 +45,24 @@ interface GreetingState {
 }
 interface Greeting extends React.CompositeComponent<GreetingProps, GreetingState> {
 }
-var Greeting = React.createClass({displayName: "Greeting",
+var Greeting = React.createClass({
+    displayName: "Greeting",
     getInitialState: function() {
         return {morning: true};
     },
     render: function() {
         var me = <Greeting>this;
-        return React.DOM.div(null, (me.state.morning ? "Hello" : "Goodbye "), me.props.name);
+        return React.DOM.div(
+            null,
+            me.state.morning ? "Hello " : "Goodbye ",
+            me.props.name);
     }
 });
 
-var root = React.addons.TestUtils.renderIntoDocument(React.createElement(Greeting, {name: "John"}));
-var greeting = <Greeting>React.addons.TestUtils.findRenderedComponentWithType(root, Greeting);
+var root = React.addons.TestUtils.renderIntoDocument(
+    React.createElement(Greeting, {name: "John"}));
+var greeting = <Greeting>React.addons.TestUtils
+    .findRenderedComponentWithType(root, Greeting);
 greeting.setState({
     morning: false
 });
-
-var isImportant: boolean;
-var isRead: boolean;
-var cx = React.addons.classSet;
-var classes: string = cx({
-    "message": true,
-    "message-important": isImportant,
-    "message-read": isRead
-});
diff --git a/react/react.d.ts b/react/react.d.ts
index 65153341b..ca94c7e01 100644
--- a/react/react.d.ts
+++ b/react/react.d.ts
@@ -647,21 +647,29 @@ declare module React {
     }
 
     //
-    // React.addons (Transitions)
+    // React.addons
     // ----------------------------------------------------------------------
 
-    interface CSSTransitionGroupProps {
-        transitionName: string;
-        transitionAppear?: boolean;
-        transitionEnter?: boolean;
-        transitionLeave?: boolean;
+    interface ClassSet {
+        [key: string]: boolean;
     }
 
+    //
+    // React.addons (Transitions)
+    // ----------------------------------------------------------------------
+
     interface TransitionGroupProps {
         component?: any; // ReactType
         childFactory?: (child: ReactElement<any>) => ReactElement<any>;
     }
 
+    interface CSSTransitionGroupProps extends TransitionGroupProps {
+        transitionName: string;
+        transitionAppear?: boolean;
+        transitionEnter?: boolean;
+        transitionLeave?: boolean;
+    }
+
     interface CSSTransitionGroup extends ComponentClass<CSSTransitionGroupProps> {}
     interface TransitionGroup extends ComponentClass<TransitionGroupProps> {}
 
@@ -874,7 +882,7 @@ declare module React {
             batchedUpdates<A>(callback: (a: A) => any, a: A): void;
             batchedUpdates(callback: () => any): void;
 
-            classSet(cx: { [key: string]: boolean }): string;
+            classSet(cx: ClassSet): string;
             cloneWithProps<P>(element: ReactElement<P>, props: P): ReactElement<P>;
 
             update(value: any[], spec: UpdateArraySpec): any[];