diff --git a/AUTHORS b/AUTHORS
index cc7b65f08..67d80b6f1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -55,3 +55,4 @@ List of contributors, in chronological order:
 * Mauro Regli (https://github.com/reglim)
 * Alexander Zubarev (https://github.com/strike)
 * Nicolas Dostert (https://github.com/acdn-ndostert)
+* Ryan Gonzalez (https://github.com/refi64)
diff --git a/system/lib.py b/system/lib.py
index d33e98e86..c651ea635 100644
--- a/system/lib.py
+++ b/system/lib.py
@@ -296,15 +296,12 @@ def run_cmd(self, command, expected_code=0):
             if is_aptly_command:
                 # remove the last two rows as go tests always print PASS/FAIL and coverage in those
                 # two lines. This would otherwise fail the tests as they would not match gold
-                matches = re.findall(r"((.|\n)*)EXIT: (\d)\n.*\ncoverage: .*", raw_output.decode("utf-8"))
-                if not matches:
+                match = re.search(r"EXIT: (\d)\n.*\n.*coverage: .*", raw_output.decode("utf-8"))
+                if match is None:
                     raise Exception("no matches found in output '%s'" % raw_output.decode("utf-8"))
 
-                output, _, returncode = matches[0]
-
-                output = output.encode()
-                returncodes.append(int(returncode))
-
+                output = match.string[:match.start()].encode()
+                returncodes.append(int(match.group(1)))
             else:
                 output = raw_output