diff --git a/react/react-tests.ts b/react/react-tests.ts
new file mode 100644
index 000000000..bf60df67c
--- /dev/null
+++ b/react/react-tests.ts
@@ -0,0 +1,71 @@
+/// <reference path="react.d.ts" />
+import React = require("react");
+
+var PropTypesSpecification: React.Specification<any, any> = {
+    propTypes: {
+        // You can declare that a prop is a specific JS primitive. By default, these
+        // are all optional.
+        optionalArray: React.PropTypes.array,
+        optionalBool: React.PropTypes.bool,
+        optionalFunc: React.PropTypes.func,
+        optionalNumber: React.PropTypes.number,
+        optionalObject: React.PropTypes.object,
+        optionalString: React.PropTypes.string,
+
+        // Anything that can be rendered: numbers, strings, components or an array
+        // containing these types.
+        optionalRenderable: React.PropTypes.renderable,
+
+        // A React component.
+        optionalComponent: React.PropTypes.component,
+
+        // You can also declare that a prop is an instance of a class. This uses
+        // JS's instanceof operator.
+        optionalMessage: React.PropTypes.instanceOf(Date),
+
+        // You can ensure that your prop is limited to specific values by treating
+        // it as an enum.
+        optionalEnum: React.PropTypes.oneOf(['News', 'Photos']),
+
+        // An object that could be one of many types
+        optionalUnion: React.PropTypes.oneOfType([
+            React.PropTypes.string,
+            React.PropTypes.number,
+            React.PropTypes.instanceOf(Date)
+        ]),
+
+        // An array of a certain type
+        optionalArrayOf: React.PropTypes.arrayOf(React.PropTypes.number),
+
+        // An object with property values of a certain type
+        optionalObjectOf: React.PropTypes.objectOf(React.PropTypes.number),
+
+        // An object taking on a particular shape
+        optionalObjectWithShape: React.PropTypes.shape({
+            color: React.PropTypes.string,
+            fontSize: React.PropTypes.number
+        }),
+
+        // You can chain any of the above with `isRequired` to make sure a warning
+        // is shown if the prop isn't provided.
+        requiredFunc: React.PropTypes.func.isRequired,
+
+        // A value of any data type
+        requiredAny: React.PropTypes.any.isRequired,
+
+        // You can also specify a custom validator. It should return an Error
+        // object if the validation fails. Don't `console.warn` or throw, as this
+        // won't work inside `oneOfType`.
+        customProp: function(props, propName, componentName) {
+            if (!/matchme/.test(props[propName])) {
+                return new Error('Validation failed!');
+            }
+            return null;
+        }
+    },
+    render(): React.Descriptor<any> {
+        return null;
+    }
+};
+
+React.createClass(PropTypesSpecification);
\ No newline at end of file
diff --git a/react/react.d.ts b/react/react.d.ts
index 1166863f3..e9fc495fb 100644
--- a/react/react.d.ts
+++ b/react/react.d.ts
@@ -31,21 +31,22 @@ declare module "react" {
         componentWillUnmount?(): void;
     }
 
-    interface FunctionMap {
-        [key: string]: Function
-    }
-
     export interface Specification<P, S> extends Mixin<P, S> {
         displayName?: string;
         mixins?: Mixin<P, S>[];
-        statics?: FunctionMap;
-        propTypes?: FunctionMap;
+        statics?: {
+            [key: string]: Function;
+        };
+        propTypes?: ValidationMap<P>;
         getDefaultProps?(): P;
         getInitialState?(): S;
         render(): Descriptor<any>;
     }
 
     export interface Component<P, S> {
+        // TODO: Refs
+        props: P;
+        state: S;
         setState(nextState: S, callback?: () => void): void;
         replaceState(nextState: S, callback?: () => void): void;
         forceUpdate(callback?: () => void): void;
@@ -60,25 +61,34 @@ declare module "react" {
         new(): any;
     }
 
-    interface Requireable extends Function {
-        isRequired: Function;
+    interface Validator<P> {
+        (props: P, propName: string, componentName: string): Error;
     }
 
-    export var PropsTypes: {
-      any: Requireable;
-      array: Requireable;
-      bool: Requireable;
-      func: Requireable;
-      number: Requireable;
-      object: Requireable;
-      string: Requireable;
-      renderable: Requireable;
-      component: Requireable;
-      instanceOf: (clazz: Constructable) => Requireable;
-      oneOf: (types: any[]) => Requireable;
-      oneOfType: (types: Function[]) => Requireable;
-      arrayOf: (type: Function) => Requireable;
-      shape: (type: FunctionMap) => Requireable;
+    interface Requireable<P> extends Validator<P> {
+        isRequired: Validator<P>;
+    }
+
+    interface ValidationMap<P> {
+        [key: string]: Validator<P>;
+    }
+
+    export var PropTypes: {
+      any: Requireable<any>;
+      array: Requireable<any>;
+      bool: Requireable<any>;
+      func: Requireable<any>;
+      number: Requireable<any>;
+      object: Requireable<any>;
+      string: Requireable<any>;
+      renderable: Requireable<any>;
+      component: Requireable<any>;
+      instanceOf: (clazz: Constructable) => Requireable<any>;
+      oneOf: (types: any[]) => Requireable<any>
+      oneOfType: (types: Validator<any>[]) => Requireable<any>;
+      arrayOf: (type: Validator<any>) => Requireable<any>;
+      objectOf: (type: Validator<any>) => Requireable<any>;
+      shape: (type: ValidationMap<any>) => Requireable<any>;
     };
 
     export var Children: {