diff --git a/src/test/ReactTestUtils.js b/src/test/ReactTestUtils.js
index ab1d75d0b5e8..e207ea8140d4 100644
--- a/src/test/ReactTestUtils.js
+++ b/src/test/ReactTestUtils.js
@@ -174,7 +174,7 @@ var ReactTestUtils = {
         var instClassName = React.findDOMNode(inst).className;
         return (
           instClassName &&
-          (' ' + instClassName + ' ').indexOf(' ' + className + ' ') !== -1
+          (('' + instClassName).split(/\s+/)).indexOf(className) !== -1
         );
       }
       return false;
diff --git a/src/test/__tests__/ReactTestUtils-test.js b/src/test/__tests__/ReactTestUtils-test.js
index 7311bcf0d053..7ae7dba19f1f 100644
--- a/src/test/__tests__/ReactTestUtils-test.js
+++ b/src/test/__tests__/ReactTestUtils-test.js
@@ -187,6 +187,17 @@ describe('ReactTestUtils', function() {
 
   });
 
+  it('Test scryRenderedDOMComponentsWithClass with className contains \\n', function() {
+    var renderedComponent = ReactTestUtils.renderIntoDocument(<div>Hello <span className={`x
+    y`}>Jim</span></div>);
+    var scryResults = ReactTestUtils.scryRenderedDOMComponentsWithClass(
+      renderedComponent,
+      'x'
+    );
+    expect(scryResults.length).toBe(1);
+
+  });
+
   it('traverses children in the correct order', function() {
     var container = document.createElement('div');