--- a/tools/docs/mach_commands.py
+++ b/tools/docs/mach_commands.py
@@ -130,70 +130,16 @@ class Documentation(MachCommandBase):
         help='Path(s) to documentation to build and upload.')
     def upload_docs(self, what=None):
         self._activate_virtualenv()
         self.virtualenv_manager.install_pip_package('boto3==1.4.4')
 
         outdir = os.path.join(self.topobjdir, 'docs')
         self.build_docs(what=what, outdir=outdir, format='html')
 
-        self.s3_upload(os.path.join(outdir, 'html', 'Mozilla_Source_Tree_Docs'))
-
-    def s3_upload(self, root):
-        """Upload the contents of outdir recursively to S3"""
-        import boto3
-        import mimetypes
-        import requests
-
-        region = 'us-west-2'
-        level = os.environ.get('MOZ_SCM_LEVEL', '1')
-        bucket = {
-            '1': 'gecko-docs.mozilla.org-l1',
-            '2': 'gecko-docs.mozilla.org-l2',
-            '3': 'gecko-docs.mozilla.org',
-        }[level]
-        secrets_url = 'http://taskcluster/secrets/v1/secret/'
-        secrets_url += 'project/releng/gecko/build/level-{}/gecko-docs-upload'.format(level)
+        from moztreedocs.upload import s3_upload
+        s3_upload(os.path.join(outdir, 'html', 'Mozilla_Source_Tree_Docs'))
 
-        # Get the credentials from the TC secrets service.  Note that these
-        # differ per SCM level
-        if 'TASK_ID' in os.environ:
-            print("Using AWS credentials from the secrets service")
-            session = requests.Session()
-            res = session.get(secrets_url)
-            res.raise_for_status()
-            secret = res.json()['secret']
-            session = boto3.session.Session(
-                aws_access_key_id=secret['AWS_ACCESS_KEY_ID'],
-                aws_secret_access_key=secret['AWS_SECRET_ACCESS_KEY'],
-                region_name=region)
-        else:
-            print("Trying to use your AWS credentials..")
-            session = boto3.session.Session(region_name=region)
-        s3 = session.client('s3')
-
-        try:
-            old_cwd = os.getcwd()
-            os.chdir(root)
-
-            for dir, dirs, filenames in os.walk('.'):
-                if dir == '.':
-                    # ignore a few things things in the root directory
-                    bad = [d for d in dirs if d.startswith('.') or d in ('_venv', '_staging')]
-                    for b in bad:
-                        dirs.remove(b)
-                for filename in filenames:
-                    pathname = os.path.join(dir, filename)[2:]  # strip '.''
-                    content_type, content_encoding = mimetypes.guess_type(pathname)
-                    extra_args = {}
-                    if content_type:
-                        extra_args['ContentType'] = content_type
-                    if content_encoding:
-                        extra_args['ContentEncoding'] = content_encoding
-                    print('uploading', pathname)
-                    s3.upload_file(pathname, bucket, pathname, ExtraArgs=extra_args)
-        finally:
-            os.chdir(old_cwd)
 
 def die(msg, exit_code=1):
     msg = '%s: %s' % (sys.argv[0], msg)
     print(msg, file=sys.stderr)
     return exit_code

new file mode 100644
--- /dev/null
+++ b/tools/docs/moztreedocs/upload.py
@@ -0,0 +1,65 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, # You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from __future__ import absolute_import, unicode_literals
+
+import mimetypes
+import os
+
+import boto3
+import requests
+
+
+def s3_upload(root):
+    region = 'us-west-2'
+    level = os.environ.get('MOZ_SCM_LEVEL', '1')
+    bucket = {
+        '1': 'gecko-docs.mozilla.org-l1',
+        '2': 'gecko-docs.mozilla.org-l2',
+        '3': 'gecko-docs.mozilla.org',
+    }[level]
+    secrets_url = 'http://taskcluster/secrets/v1/secret/'
+    secrets_url += 'project/releng/gecko/build/level-{}/gecko-docs-upload'.format(
+        level)
+
+    # Get the credentials from the TC secrets service.  Note that these
+    # differ per SCM level
+    if 'TASK_ID' in os.environ:
+        print("Using AWS credentials from the secrets service")
+        session = requests.Session()
+        res = session.get(secrets_url)
+        res.raise_for_status()
+        secret = res.json()['secret']
+        session = boto3.session.Session(
+            aws_access_key_id=secret['AWS_ACCESS_KEY_ID'],
+            aws_secret_access_key=secret['AWS_SECRET_ACCESS_KEY'],
+            region_name=region)
+    else:
+        print("Trying to use your AWS credentials..")
+        session = boto3.session.Session(region_name=region)
+    s3 = session.client('s3')
+
+    try:
+        old_cwd = os.getcwd()
+        os.chdir(root)
+
+        for dir, dirs, filenames in os.walk('.'):
+            if dir == '.':
+                # ignore a few things things in the root directory
+                bad = [d for d in dirs if
+                       d.startswith('.') or d in ('_venv', '_staging')]
+                for b in bad:
+                    dirs.remove(b)
+            for filename in filenames:
+                pathname = os.path.join(dir, filename)[2:]  # strip '.''
+                content_type, content_encoding = mimetypes.guess_type(pathname)
+                extra_args = {}
+                if content_type:
+                    extra_args['ContentType'] = content_type
+                if content_encoding:
+                    extra_args['ContentEncoding'] = content_encoding
+                print('uploading', pathname)
+                s3.upload_file(pathname, bucket, pathname, ExtraArgs=extra_args)
+    finally:
+        os.chdir(old_cwd)