diff --git a/src/isomorphic/__tests__/ReactPerf-test.js b/src/isomorphic/__tests__/ReactPerf-test.js
index 98df00938b..456ce9011e 100644
--- a/src/isomorphic/__tests__/ReactPerf-test.js
+++ b/src/isomorphic/__tests__/ReactPerf-test.js
@@ -67,6 +67,13 @@ describe('ReactPerf', function() {
     ReactPerf.start();
     fn();
     ReactPerf.stop();
+
+    // Make sure none of the methods crash.
+    ReactPerf.getWasted();
+    ReactPerf.getInclusive();
+    ReactPerf.getExclusive();
+    ReactPerf.getOperations();
+
     return ReactPerf.getLastMeasurements();
   }
 
@@ -208,6 +215,32 @@ describe('ReactPerf', function() {
     });
   });
 
+  it('should not count replacing null with a native as waste', function() {
+    var element = null;
+    function Foo () {
+      return element;
+    }
+    var container = document.createElement('div');
+    ReactDOM.render(<Foo />, container);
+    expectNoWaste(() => {
+      element = <div />;
+      ReactDOM.render(<Foo />, container);
+    });
+  });
+
+  it('should not count replacing a native with null as waste', function() {
+    var element = <div />;
+    function Foo () {
+      return element;
+    }
+    var container = document.createElement('div');
+    ReactDOM.render(<Foo />, container);
+    expectNoWaste(() => {
+      element = null;
+      ReactDOM.render(<Foo />, container);
+    });
+  });
+
   it('warns once when using getMeasurementsSummaryMap', function() {
     var measurements = measure(() => {});
     spyOn(console, 'error');