--- a/testing/marionette/marionette-server.js
+++ b/testing/marionette/marionette-server.js
@@ -176,16 +176,17 @@ MarionetteServerConnection.prototype = {
 
   /**
    * Debugger transport callbacks:
    */
   onPacket: function MSC_onPacket(aPacket) {
     // Dispatch the request
     if (this.requestTypes && this.requestTypes[aPacket.name]) {
       try {
+        this.logRequest(aPacket.name, aPacket);
         this.requestTypes[aPacket.name].bind(this)(aPacket);
       } catch(e) {
         this.conn.send({ error: ("error occurred while processing '" +
                                  aPacket.name),
                         message: e.message });
       }
     } else {
       this.conn.send({ error: "unrecognizedPacketType",
@@ -661,17 +662,16 @@ MarionetteServerConnection.prototype = {
   /**
    * Sets the context of the subsequent commands to be either 'chrome' or 'content'
    *
    * @param object aRequest
    *        'value' member holds the name of the context to be switched to
    */
   setContext: function MDA_setContext(aRequest) {
     this.command_id = this.getCommandId();
-    this.logRequest("setContext", aRequest);
     let context = aRequest.parameters.value;
     if (context != "content" && context != "chrome") {
       this.sendError("invalid context", 500, null, this.command_id);
     }
     else {
       this.context = context;
       this.sendOk(this.command_id);
     }
@@ -785,17 +785,16 @@ MarionetteServerConnection.prototype = {
    *        if true, it will be run directly and not as a
    *        function body
    */
   execute: function MDA_execute(aRequest, directInject) {
     let inactivityTimeout = aRequest.parameters.inactivityTimeout;
     let timeout = aRequest.parameters.scriptTimeout ? aRequest.parameters.scriptTimeout : this.scriptTimeout;
     let command_id = this.command_id = this.getCommandId();
     let script;
-    this.logRequest("execute", aRequest);
     if (aRequest.parameters.newSandbox == undefined) {
       //if client does not send a value in newSandbox,
       //then they expect the same behaviour as webdriver
       aRequest.parameters.newSandbox = true;
     }
     if (this.context == "content") {
       this.sendAsync("executeScript",
                      {
@@ -952,17 +951,16 @@ MarionetteServerConnection.prototype = {
    *        if true, it will be run directly and not as a
    *        function body
    */
   executeWithCallback: function MDA_executeWithCallback(aRequest, directInject) {
     let inactivityTimeout = aRequest.parameters.inactivityTimeout;
     let timeout = aRequest.parameters.scriptTimeout ? aRequest.parameters.scriptTimeout : this.scriptTimeout;
     let command_id = this.command_id = this.getCommandId();
     let script;
-    this.logRequest("executeWithCallback", aRequest);
     if (aRequest.parameters.newSandbox == undefined) {
       //if client does not send a value in newSandbox,
       //then they expect the same behaviour as webdriver
       aRequest.parameters.newSandbox = true;
     }
 
     if (this.context == "content") {
       this.sendAsync("executeAsyncScript",
@@ -1387,17 +1385,16 @@ MarionetteServerConnection.prototype = {
    * @param object aRequest
    *        'element' is the element to switch to
    *        'id' if element is not set, then this
    *                holds either the id, name or index
    *                of the frame to switch to
    */
   switchToFrame: function MDA_switchToFrame(aRequest) {
     let command_id = this.command_id = this.getCommandId();
-    this.logRequest("switchToFrame", aRequest);
     let checkTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
     let curWindow = this.getCurrentWindow();
     let checkLoad = function() {
       let errorRegex = /about:.+(error)|(blocked)\?/;
       let curWindow = this.getCurrentWindow();
       if (curWindow.document.readyState == "complete") {
         this.sendOk(command_id);
         return;
@@ -2070,17 +2067,16 @@ MarionetteServerConnection.prototype = {
 
   /**
    * Sets the test name
    *
    * The test name is used in logging messages.
    */
   setTestName: function MDA_setTestName(aRequest) {
     this.command_id = this.getCommandId();
-    this.logRequest("setTestName", aRequest);
     this.testName = aRequest.parameters.value;
     this.sendAsync("setTestName",
                    { value: aRequest.parameters.value },
                    this.command_id);
   },
 
   /**
    * Clear the text of an element