diff --git a/react/react-tests.ts b/react/react-tests.ts
index ed352af39..c87137f8e 100644
--- a/react/react-tests.ts
+++ b/react/react-tests.ts
@@ -115,6 +115,30 @@ var value: string = inputRef.getDOMNode<HTMLInputElement>().value;
 var myComponent = <MyComponent>compComponent;
 myComponent.reset();
 
+//
+// Attributes
+// --------------------------------------------------------------------------
+
+var divStyle = { // CSSProperties
+    flex: "1 1 main-size",
+    backgroundImage: "url('hello.png')"
+};
+var htmlAttr = {
+    children: ["Hello world", [null], React.DOM.span(null)],
+    className: "test-attr",
+    style: divStyle,
+    onClick: (event: React.MouseEvent) => {
+        event.preventDefault();
+        event.stopPropagation();
+    },
+    dangerouslySetInnerHTML: {
+        __html: "<strong>STRONG</strong>"
+    }
+};
+React.DOM.div(htmlAttr);
+React.DOM.span(htmlAttr);
+React.DOM.input(htmlAttr);
+
 //
 // PropTypes
 // --------------------------------------------------------------------------
diff --git a/react/react.d.ts b/react/react.d.ts
index b5b77e396..849bd58f0 100644
--- a/react/react.d.ts
+++ b/react/react.d.ts
@@ -285,7 +285,7 @@ declare module React {
 
     interface CSSProperties {
         columnCount?: number;
-        flex?: number;
+        flex?: any; // number | string
         flexGrow?: number;
         flexShrink?: number;
         fontWeight?: number;
@@ -301,8 +301,6 @@ declare module React {
         // SVG-related properties
         fillOpacity?: number;
         strokeOpacity?: number;
-
-        [key: string]: any; // number | string
     }
 
     interface HTMLAttributes extends ReactAttributes {