diff --git a/appscale/tools/appscale_logger.py b/appscale/tools/appscale_logger.py
index 9e177377..ca005a06 100644
--- a/appscale/tools/appscale_logger.py
+++ b/appscale/tools/appscale_logger.py
@@ -1,4 +1,5 @@
 import httplib
+import os
 
 from termcolor import cprint
 
@@ -74,13 +75,18 @@ def remote_log_tools_state(cls, options, my_id, state, version):
     Returns:
       A dict containing the debugging information that was logged.
     """
+    if 'false' == os.environ.get('APPSCALE_TRACKING'):
+      return {}
+
     # turn namespace into a dict
-    params = vars(options)
+    keys = ('autoscale', 'infrastructure')
+    params_full = vars(options)
+    params = {key: params_full[key] for key in keys}
 
     # next, turn it into a string that we can send over the wire
     payload = "?boo=baz&my_id={0}&state={1}&version={2}".format(my_id, state,
       version)
-    for key, value in params.iteritems():
+    for key, value in params.items():
       payload += "&{0}={1}".format(key, value)
 
     # http post the result
diff --git a/test/test_appscale_logger.py b/test/test_appscale_logger.py
index 755188cb..055994b3 100644
--- a/test/test_appscale_logger.py
+++ b/test/test_appscale_logger.py
@@ -47,65 +47,14 @@ def setUp(self):
     self.my_id = "12345"
 
     self.expected = {
-      "EC2_ACCESS_KEY" : None,
-      "EC2_SECRET_KEY" : None,
-      "EC2_URL" : None,
-      "admin_pass" : None,
-      "admin_user" : None,
-      "default_min_appservers" : 1,
       "autoscale" : True,
-      "client_secrets" : None,
-      "disks" : None,
-      "min_machines" : 1,
-      "max_machines" : 1,
       "infrastructure" : "ec2",
-      "machine" : "ami-ABCDEFG",
-      "flower_password" : ParseArgs.DEFAULT_FLOWER_PASSWORD,
-      "force" : False,
-      "group" : "blargscale",
-      "instance_type" : "m3.medium",
-      "ips" : None,
-      "ips_layout" : None,
-      "keyname" : "appscale",
-      "login_host" : None,
-      "default_max_appserver_memory" : 400,
-      "max_spot_price": None,
-      "oauth2_storage" : None,
-      "project" : None,
-      "replication" : None,
-      "rsync_source" : None,
-      "static_ip" : None,
-      "table" : "cassandra",
-      "test" : False,
-      "use_spot_instances" : False,
-      "user_commands" : [],
-      "verbose" : False,
-      "version" : False,
-      "zone" : "my-zone-1b",
-      "aws_subnet_id" : None,
-      "aws_vpc_id" : None,
-      "azure_subscription_id" : None,
-      "azure_app_id" : None,
-      "azure_app_secret_key" : None,
-      "azure_tenant_id" : None,
-      "azure_resource_group" : None,
-      "azure_group_tag" : None,
-      "azure_storage_account" : None,
-      "clear_datastore" : False,
-      'EC2_ACCESS_KEY': 'baz',
-      'EC2_SECRET_KEY': 'baz',
-      'EC2_URL': '',
-      'fdb_clusterfile_content': None,
-      'postgres_dsn': None,
-      'update': ['common']
     }
 
     # finally, construct a http payload for mocking that the below
     # tests can use
-    self.payload = "?boo=baz&min=1&max=1&infrastructure=ec2" + \
-      "&machine=ami-ABCDEFG&force=False&group=appscale" + \
-      "&instance_type=m3.medium&keyname=appscale&n=None" + \
-      "table=cassandra&test=False&version=False"
+    self.payload = ("?boo=baz&my_id=12345&state=started&version=X.Y.Z"
+                    "&infrastructure=ec2&autoscale=True")
 
 
   def test_remote_log_tools_state_when_remote_is_up(self):
@@ -113,7 +62,7 @@ def test_remote_log_tools_state_when_remote_is_up(self):
     fake_connection = flexmock(name="fake_connection")
     fake_connection.should_receive('request').with_args('POST',
       '/upload', self.payload, AppScaleLogger.HEADERS) \
-      .and_return()
+      .and_return().once()
     flexmock(httplib).should_receive('HTTPConnection') \
       .and_return(fake_connection)