--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -8,17 +8,16 @@
 component_engine = ('Core', 'JavaScript Engine')
 component_gc     = ('Core', 'JavaScript: GC')
 component_intl   = ('Core', 'JavaScript: Internationalization API')
 component_jit    = ('Core', 'JavaScript Engine: JIT')
 component_stl    = ('Core', 'JavaScript: Standard Library')
 
 FILES_PER_UNIFIED_FILE = 6
 
-
 with Files('../public/**'):
     BUG_COMPONENT = component_engine
 with Files('*'):
     BUG_COMPONENT = component_engine
 
 with Files('asmjs/**'):
     BUG_COMPONENT = component_jit
 with Files('builtin/**'):

--- a/testing/taskcluster/scripts/builder/build-haz-linux.sh
+++ b/testing/taskcluster/scripts/builder/build-haz-linux.sh
@@ -17,17 +17,17 @@ shift
 SCRIPT_FLAGS="$*"
 
 # Use GECKO_BASE_REPOSITORY as a signal for whether we are running in automation.
 export AUTOMATION=${GECKO_BASE_REPOSITORY:+1}
 
 : ${GECKO_DIR:=$WORKSPACE/gecko}
 : ${TOOLTOOL_MANIFEST:=browser/config/tooltool-manifests/linux64/hazard.manifest}
 : ${TOOLTOOL_CACHE:=$WORKSPACE/tt-cache}
-: ${TOOLTOOL_REPO:=https://github.com/mozilla/build-tooltool.git}
+: ${TOOLTOOL_REPO:=https://github.com/mozilla/build-tooltool}
 
 if ! [ -d $GECKO_DIR ]; then
     echo "GECKO_DIR must be set to a directory containing a gecko source checkout" >&2
     exit 1
 fi
 GECKO_DIR=$( cd "$GECKO_DIR" && pwd )
 
 # Directory to populate with tooltool-installed tools

--- a/testing/taskcluster/scripts/builder/sm-tooltool-config.sh
+++ b/testing/taskcluster/scripts/builder/sm-tooltool-config.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
 set -xe
 
 : ${TOOLTOOL_SERVER:=https://api.pub.build.mozilla.org/tooltool/}
-: ${TOOLTOOL_REPO:=https://github.com/mozilla/build-tooltool.git}
+: ${TOOLTOOL_REPO:=https://github.com/mozilla/build-tooltool}
 : ${TOOLTOOL_REV:=master}
 : ${SPIDERMONKEY_VARIANT:=plain}
 : ${UPLOAD_DIR:=$HOME/artifacts/}
 : ${WORK:=$HOME/workspace}
 : ${SRCDIR:=$WORK/build/src}
 
 mkdir -p $WORK
 cd $WORK

--- a/testing/taskcluster/tasks/build.yml
+++ b/testing/taskcluster/tasks/build.yml
@@ -41,17 +41,17 @@ task:
 
 
     env:
       # Common environment variables for checking out gecko
       GECKO_BASE_REPOSITORY: '{{base_repository}}'
       GECKO_HEAD_REPOSITORY: '{{head_repository}}'
       GECKO_HEAD_REV: '{{head_rev}}'
       GECKO_HEAD_REF: '{{head_ref}}'
-      TOOLTOOL_REPO: 'https://github.com/mozilla/build-tooltool.git'
+      TOOLTOOL_REPO: 'https://github.com/mozilla/build-tooltool'
       TOOLTOOL_REV: 'master'
       MOZ_BUILD_DATE: '{{pushdate}}'
       MOZ_SCM_LEVEL: '{{level}}'
 
   extra:
     build_product: '{{build_product}}'
     build_name: '{{build_name}}'
     build_type: '{{build_type}}'

--- a/testing/taskcluster/tasks/harness_test.yml
+++ b/testing/taskcluster/tasks/harness_test.yml
@@ -44,17 +44,17 @@ task:
       - bash
       - /home/worker/bin/build.sh
     env:
       # Common environment variables for checking out gecko
       GECKO_BASE_REPOSITORY: '{{base_repository}}'
       GECKO_HEAD_REPOSITORY: '{{head_repository}}'
       GECKO_HEAD_REV: '{{head_rev}}'
       GECKO_HEAD_REF: '{{head_ref}}'
-      TOOLTOOL_REPO: 'https://github.com/mozilla/build-tooltool.git'
+      TOOLTOOL_REPO: 'https://github.com/mozilla/build-tooltool'
       TOOLTOOL_REV: 'master'
       TOOLS_DISABLE: true
       MOZ_BUILD_DATE: '{{pushdate}}'
       MOZ_SCM_LEVEL: '{{level}}'
 
   extra:
     # These definitions are expected of build tasks but not used in our case
     build_product: '{{build_product}}'