diff --git a/src/test/fuzz/peerconnection/corpus/template00.html b/src/test/fuzz/peerconnection/corpus/template00.html
index 2856d1a7e..08bccb03d 100644
--- a/src/test/fuzz/peerconnection/corpus/template00.html
+++ b/src/test/fuzz/peerconnection/corpus/template00.html
@@ -21,6 +21,7 @@ INCLUDE_FUZZ_SDP_JS
   var gTransformOfferSdp = TRANSFORM_OFFER_SDP;
   var gTransformAnswerSdp = TRANSFORM_ANSWER_SDP;
 
+  // START_OF_POSSIBLE_INJECTED_LOCATION_RELOADS
   function startTest() {
     navigator.webkitGetUserMedia(REQUEST_AUDIO_AND_VIDEO,
                                  getUserMediaOkCallback,
@@ -98,6 +99,7 @@ INCLUDE_FUZZ_SDP_JS
     setRandomRolls(gRandomRolls);
     startTest();
   }
+  // END_OF_POSSIBLE_INJECTED_LOCATION_RELOADS
 
   // This variable is placed here since its value is pretty big.
   var gRandomRolls = ARRAY_OF_RANDOM_ROLLS;
diff --git a/src/test/fuzz/peerconnection/corpus/template01.html b/src/test/fuzz/peerconnection/corpus/template01.html
index 118695458..6b8b8b433 100644
--- a/src/test/fuzz/peerconnection/corpus/template01.html
+++ b/src/test/fuzz/peerconnection/corpus/template01.html
@@ -21,6 +21,7 @@ INCLUDE_FUZZ_SDP_JS
   var gTransformOfferSdp = TRANSFORM_OFFER_SDP;
   var gTransformAnswerSdp = TRANSFORM_ANSWER_SDP;
 
+  // START_OF_POSSIBLE_INJECTED_LOCATION_RELOADS
   function startTest() {
     navigator.webkitGetUserMedia(REQUEST_AUDIO_AND_VIDEO,
                                  getUserMediaOkCallback,
@@ -49,7 +50,7 @@ INCLUDE_FUZZ_SDP_JS
     gFirstConnection.setLocalDescription(offer);
 
     var offerSdp = gTransformOfferSdp(offer.sdp);
-    console.log("OFFER SDP MESSAGE===========================\n" + offerSdp);
+    console.log('OFFER SDP MESSAGE:' + offerSdp);
     receiveCall(offerSdp);
   }
 
@@ -58,7 +59,7 @@ INCLUDE_FUZZ_SDP_JS
     gSecondConnection.onicecandidate = onIceCandidateToSecond;
     gSecondConnection.onaddstream = onRemoteStream;
 
-    var parsedOffer = new RTCSessionDescription({ type: "offer",
+    var parsedOffer = new RTCSessionDescription({ type: 'offer',
                                                   sdp: offerSdp });
     gSecondConnection.setRemoteDescription(parsedOffer);
 
@@ -69,12 +70,12 @@ INCLUDE_FUZZ_SDP_JS
     gSecondConnection.setLocalDescription(answer);
 
     answerSdp = gTransformAnswerSdp(answer.sdp);
-    console.log("ANSWER SDP MESSAGE===========================\n" + answerSdp);
+    console.log('ANSWER SDP MESSAGE:' + answerSdp);
     handleAnswer(answerSdp);
   }
 
   function handleAnswer(answerSdp) {
-    var parsedAnswer = new RTCSessionDescription({ type: "answer",
+    var parsedAnswer = new RTCSessionDescription({ type: 'answer',
                                                    sdp: answerSdp });
     gFirstConnection.setRemoteDescription(parsedAnswer);
   }
@@ -102,6 +103,7 @@ INCLUDE_FUZZ_SDP_JS
     setRandomRolls(gRandomRolls);
     startTest();
   }
+  // END_OF_POSSIBLE_INJECTED_LOCATION_RELOADS
 
   // This variable is placed here since its value is pretty big.
   var gRandomRolls = ARRAY_OF_RANDOM_ROLLS;
diff --git a/src/test/fuzz/peerconnection/peerconnection_fuzz.py b/src/test/fuzz/peerconnection/peerconnection_fuzz.py
index 3f5d6b065..7bd532996 100644
--- a/src/test/fuzz/peerconnection/peerconnection_fuzz.py
+++ b/src/test/fuzz/peerconnection/peerconnection_fuzz.py
@@ -8,10 +8,11 @@
 #  be found in the AUTHORS file in the root of the source tree.
 
 import random
+import re
 import string
 import unicodedata
 
-from common.fuzz_parameters import FillInParameter
+from common.fuzz_parameters import FillInParameter, MissingParameterException
 from common.random_javascript import *
 
 
@@ -56,6 +57,67 @@ def _RandomSdpTransform():
     return _ReturnFirstArgument()
 
 
+def _InsertRandomLocationReload(list_of_lines, num_to_insert):
+  length = len(list_of_lines)
+  assert length > num_to_insert
+
+  # Randomly choose insertion points to insert at (if
+  # num_to_insert == length - 1, all will be replaced).
+  lines_to_insert_behind = sorted(random.sample(xrange(length - 1),
+                                                num_to_insert))
+
+  result = list(list_of_lines)
+  num_inserted = 0
+  for i in lines_to_insert_behind:
+    # We're just guessing the indentation the reloads will be at, but that's
+    # just cosmetic anyway.
+    result.insert(num_inserted + i + 1, '    location.reload()')
+    num_inserted += 1
+
+  return result
+
+
+def _InsertRandomLocationReloads(file_data, replace_all):
+  lines = file_data.split(';\n')
+  if replace_all:
+    lines = _InsertRandomLocationReload(lines, len(lines) - 1)
+  else:
+    num_lines_to_insert = random.randint(1, 3)
+    lines = _InsertRandomLocationReload(lines, num_lines_to_insert)
+  return ';\n'.join(lines)
+
+
+def _InsertRandomLocationReloadsWithinMarkers(file_data,
+                                              insert_everywhere=False):
+  """Inserts random location.reload() statements in the file.
+
+  We can insert statements after other statements (e.g. after ; and newline).
+  We only consider the text between the "reload injection markers" so that we
+  can avoid injecting location.reload()s into the HTML or after variable
+  declarations, for instance. Therefore, the markers must be present in the
+  file data passed into this function.
+
+  Args:
+    file_data: The template file data as a string.
+    insert_everywhere: If true, will replace at all possible injection points.
+        If false, we will randomly choose 1-3 injection points.
+"""
+  start_marker = '// START_OF_POSSIBLE_INJECTED_LOCATION_RELOADS'
+  end_marker = '// END_OF_POSSIBLE_INJECTED_LOCATION_RELOADS'
+  within_markers_regex = re.compile(start_marker + '(.+)' + end_marker,
+                                    re.DOTALL)
+  within_markers = within_markers_regex.search(file_data)
+  if not within_markers:
+    raise MissingParameterException(
+        'Missing %s and/or %s in template.' % (start_marker, end_marker))
+
+  # Now insert the location.reload()s.
+  modified_data = _InsertRandomLocationReloads(
+      within_markers.group(1), insert_everywhere)
+
+  return within_markers_regex.sub(modified_data, file_data)
+
+
 def Fuzz(file_data):
   """Fuzzes the passed in template."""
   file_data = file_data.decode('utf-8')
@@ -65,6 +127,8 @@ def Fuzz(file_data):
   file_data = FillInParameter('ARRAY_OF_RANDOM_ROLLS',
                               _ArrayOfRandomRolls(500),
                               file_data)
+
+  # Randomly decide how to fuzz SDP data.
   file_data = FillInParameter('REQUEST_AUDIO_AND_VIDEO',
                               _RandomAudioOrVideo(),
                               file_data)
@@ -75,6 +139,11 @@ def Fuzz(file_data):
                               _RandomSdpTransform(),
                               file_data)
 
+  # Random location.reload() calls in the call sequence can be challenging for
+  # the code to deal with, so insert some here and there.
+  if random.random() < 0.3:
+    file_data = _InsertRandomLocationReloadsWithinMarkers(file_data)
+
   return file_data
 
 
diff --git a/src/test/fuzz/peerconnection/peerconnection_fuzz_unittest.py b/src/test/fuzz/peerconnection/peerconnection_fuzz_unittest.py
new file mode 100755
index 000000000..d6b19d0f0
--- /dev/null
+++ b/src/test/fuzz/peerconnection/peerconnection_fuzz_unittest.py
@@ -0,0 +1,87 @@
+#!/usr/bin/env python
+#-*- coding: utf-8 -*-
+#  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+#
+#  Use of this source code is governed by a BSD-style license
+#  that can be found in the LICENSE file in the root of the source
+#  tree. An additional intellectual property rights grant can be found
+#  in the file PATENTS.  All contributing project authors may
+#  be found in the AUTHORS file in the root of the source tree.
+
+import unittest
+
+import peerconnection_fuzz
+
+SAMPLE_TEMPLATE = """
+<html>
+<head>
+  <title>WebRTC PeerConnection Fuzz Test Template</title>
+  <script type="text/javascript">
+  var gFirstConnection = null;
+
+// START_OF_POSSIBLE_INJECTED_LOCATION_RELOADS
+  function startTest() {
+    navigator.webkitGetUserMedia(REQUEST_AUDIO_AND_VIDEO,
+                                 getUserMediaOkCallback,
+                                 getUserMediaFailedCallback);
+  }
+
+  function callUsingStream(localStream) {
+    gFirstConnection.createOffer(onOfferCreated);
+  }
+
+  function onIceCandidateToFirst(event) {
+    if (event.candidate) {
+      var candidate = new RTCIceCandidate(event.candidate);
+      gSecondConnection.addIceCandidate(candidate);
+    }
+  }
+// END_OF_POSSIBLE_INJECTED_LOCATION_RELOADS
+  </script>
+</head>"""
+
+RELOADED_TEMPLATE = """
+<html>
+<head>
+  <title>WebRTC PeerConnection Fuzz Test Template</title>
+  <script type="text/javascript">
+  var gFirstConnection = null;
+
+
+  function startTest() {
+    navigator.webkitGetUserMedia(REQUEST_AUDIO_AND_VIDEO,
+                                 getUserMediaOkCallback,
+                                 getUserMediaFailedCallback);
+    location.reload();
+  }
+
+  function callUsingStream(localStream) {
+    gFirstConnection.createOffer(onOfferCreated);
+    location.reload();
+  }
+
+  function onIceCandidateToFirst(event) {
+    if (event.candidate) {
+      var candidate = new RTCIceCandidate(event.candidate);
+    location.reload();
+      gSecondConnection.addIceCandidate(candidate);
+    location.reload();
+    }
+  }
+
+  </script>
+</head>"""
+
+class PeerConnectionFuzzerTest(unittest.TestCase):
+  def testInsertRandomReloadsInsertsAtTheRightPlace(self):
+    """Tests we can insert location.reload() in the right places.
+
+    Only tests the case where we replace all since the other case is random.
+    """
+    result = peerconnection_fuzz._InsertRandomLocationReloadsWithinMarkers(
+        SAMPLE_TEMPLATE, replace_all=True)
+    self.assertEquals(RELOADED_TEMPLATE, result,
+                      'Got "%s", should be "%s"' % (result, RELOADED_TEMPLATE))
+
+if __name__ == '__main__':
+  unittest.main()