diff --git a/tests/golden-files/results/tar_bz2-hi_tar_bz2 b/tests/golden-files/results/tar_bz2-hi_tar_bz2
index 218fe71..f8f15e8 100644
--- a/tests/golden-files/results/tar_bz2-hi_tar_bz2
+++ b/tests/golden-files/results/tar_bz2-hi_tar_bz2
@@ -1 +1 @@
--rw-rw-r-- EVERY_USER/EVERY_USER 27 2016-02-09 21:50 hi.py
+-rw-rw-r-- ahamilton/ahamilton 27 2016-02-09 21:50 hi.py
diff --git a/tests/golden-files/results/tar_gz-hi_tar_gz b/tests/golden-files/results/tar_gz-hi_tar_gz
index 218fe71..f8f15e8 100644
--- a/tests/golden-files/results/tar_gz-hi_tar_gz
+++ b/tests/golden-files/results/tar_gz-hi_tar_gz
@@ -1 +1 @@
--rw-rw-r-- EVERY_USER/EVERY_USER 27 2016-02-09 21:50 hi.py
+-rw-rw-r-- ahamilton/ahamilton 27 2016-02-09 21:50 hi.py
diff --git a/tests/golden-files/results/tar_gz-hi_tgz b/tests/golden-files/results/tar_gz-hi_tgz
index 218fe71..f8f15e8 100644
--- a/tests/golden-files/results/tar_gz-hi_tgz
+++ b/tests/golden-files/results/tar_gz-hi_tgz
@@ -1 +1 @@
--rw-rw-r-- EVERY_USER/EVERY_USER 27 2016-02-09 21:50 hi.py
+-rw-rw-r-- ahamilton/ahamilton 27 2016-02-09 21:50 hi.py
diff --git a/tests/tools_test.py b/tests/tools_test.py
index 4bde550..5f7b37b 100755
--- a/tests/tools_test.py
+++ b/tests/tools_test.py
@@ -66,7 +66,6 @@ class ToolsTestCase(unittest.TestCase):
                 with chdir(os.path.join(VIGIL_ROOT, "golden-files")):
                     cwd = os.getcwd()
                     text = text.replace(cwd, "/CWD")
-                text = text.replace(os.environ["USER"], "EVERY_USER")
                 golden.assertGolden(text, golden_path)
                 self.assertEqual(status, expected_status)