diff --git a/src/test/__tests__/ReactDefaultPerf-test.js b/src/test/__tests__/ReactDefaultPerf-test.js
new file mode 100644
index 0000000000..b2a0e50572
--- /dev/null
+++ b/src/test/__tests__/ReactDefaultPerf-test.js
@@ -0,0 +1,191 @@
+/**
+ * Copyright 2013-2015, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @emails react-core
+ */
+
+'use strict';
+
+describe('ReactDefaultPerf', function() {
+ var React;
+ var ReactDOM;
+ var ReactDefaultPerf;
+ var ReactTestUtils;
+
+ var App;
+ var Box;
+ var Div;
+
+ beforeEach(function() {
+ var now = 0;
+ require('mock-modules').setMock('performanceNow', function() {
+ return now++;
+ });
+
+ React = require('React');
+ ReactDOM = require('ReactDOM');
+ ReactDefaultPerf = require('ReactDefaultPerf');
+ ReactTestUtils = require('ReactTestUtils');
+
+ App = React.createClass({
+ render: function() {
+ return
;
+ },
+ });
+
+ Box = React.createClass({
+ render: function() {
+ return ;
+ },
+ });
+
+ // ReactPerf only measures composites, so we put everything in one.
+ Div = React.createClass({
+ render: function() {
+ return ;
+ },
+ });
+ });
+
+ function measure(fn) {
+ ReactDefaultPerf.start();
+ fn();
+ ReactDefaultPerf.stop();
+ return ReactDefaultPerf.getLastMeasurements();
+ }
+
+ it('should count no-op update as waste', function() {
+ var container = document.createElement('div');
+ ReactDOM.render(, container);
+ var measurements = measure(() => {
+ ReactDOM.render(, container);
+ });
+
+ var summary = ReactDefaultPerf.getMeasurementsSummaryMap(measurements);
+ expect(summary.length).toBe(2);
+
+ /*eslint-disable dot-notation */
+
+ expect(summary[0]['Owner > component']).toBe(' > App');
+ expect(summary[0]['Wasted time (ms)']).not.toBe(0);
+ expect(summary[0]['Instances']).toBe(1);
+
+ expect(summary[1]['Owner > component']).toBe('App > Box');
+ expect(summary[1]['Wasted time (ms)']).not.toBe(0);
+ expect(summary[1]['Instances']).toBe(2);
+
+ /*eslint-enable dot-notation */
+ });
+
+ function expectNoWaste(fn) {
+ var measurements = measure(fn);
+ var summary = ReactDefaultPerf.getMeasurementsSummaryMap(measurements);
+ expect(summary).toEqual([]);
+ }
+
+ it('should not count initial render as waste', function() {
+ expectNoWaste(() => {
+ ReactTestUtils.renderIntoDocument();
+ });
+ });
+
+ it('should not count unmount as waste', function() {
+ var container = document.createElement('div');
+ ReactDOM.render(
hello
, container);
+ expectNoWaste(() => {
+ ReactDOM.unmountComponentAtNode(container);
+ });
+ });
+
+ it('should not count content update as waste', function() {
+ var container = document.createElement('div');
+ ReactDOM.render(