diff --git a/go/bash_profile.sh b/go/bash_profile.sh
index aece91be42de..5dbfbca47e23 100644
--- a/go/bash_profile.sh
+++ b/go/bash_profile.sh
@@ -1,7 +1,6 @@
-# Set the root of our go installation
-export GOROOT=${IROOT}/go
+# IROOT=${FWROOT}/go/installs
 
-# Where to find the go executable
+export GOROOT=${IROOT}/go
 export PATH="$GOROOT/bin:$PATH"
 
 export GOPATH=${FWROOT}/go
diff --git a/toolset/benchmark/framework_test.py b/toolset/benchmark/framework_test.py
index 66637c0da1c2..b9a19e7aac22 100644
--- a/toolset/benchmark/framework_test.py
+++ b/toolset/benchmark/framework_test.py
@@ -296,7 +296,6 @@ def start(self, out, err):
     
     set_iroot="export IROOT=%s" % self.install_root
     setup_util.replace_environ(config=profile, command=set_iroot)
-
     return self.setup_module.start(self.benchmarker, out, err)
   ############################################################
   # End start
diff --git a/toolset/run-tests.py b/toolset/run-tests.py
index 85655deaba81..2225b3d52e00 100755
--- a/toolset/run-tests.py
+++ b/toolset/run-tests.py
@@ -31,7 +31,7 @@ def main(argv=None):
     fwroot = setup_util.get_fwroot()
     if not fwroot: 
         fwroot = os.getcwd()
-    setup_util.replace_environ(config='config/benchmark_profile', root=fwroot)
+    setup_util.replace_environ(config='config/benchmark_profile', root=os.getcwd())
     print "FWROOT is %s"%setup_util.get_fwroot()
 
     conf_parser = argparse.ArgumentParser(
diff --git a/toolset/setup/linux/installer.py b/toolset/setup/linux/installer.py
index d6ae98c54bb8..87f328310cfe 100644
--- a/toolset/setup/linux/installer.py
+++ b/toolset/setup/linux/installer.py
@@ -68,6 +68,7 @@ def __install_server_software(self):
             if self.strategy is 'pertest':
               test_install_dir="%s/pertest/%s" % (test_install_dir, test_name)
             test_rel_install_dir=setup_util.path_relative_to_root(test_install_dir)
+
             if not os.path.exists(test_install_dir):
               os.makedirs(test_install_dir)
 
@@ -338,6 +339,20 @@ def __bash_from_string(self, command):
   # End __bash_from_string
   ############################################################
 
+  ############################################################
+  # __path_relative_to_root
+  # Returns path minus the FWROOT prefix. Useful for clean 
+  # presentation of paths 
+  # e.g. /foo/bar/benchmarks/go/bash_profile.sh
+  # v.s. FWROOT/go/bash_profile.sh 
+  ############################################################
+  def __path_relative_to_root(self, path):
+    # Requires bash shell parameter expansion
+    return subprocess.check_output("D=%s && printf ${D#%s}"%(path, self.root), shell=True, executable='/bin/bash')
+  ############################################################
+  # End __path_relative_to_root
+  ############################################################
+
   ############################################################
   # __download
   # Downloads a file from a URI.