diff --git a/.gitignore b/.gitignore
index 9726ee9d35c3c7b9858ca1adc7c5e51e24e5d0c1..8d9395b20e010a5e17c46859a35dd1666ca619cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,5 +28,6 @@ pip-log.txt
 nosetests.xml
 
 # Envsetup
-conf-*
+conf*
+auto-generated-conf.sh
 tests/ms-testing-suite
diff --git a/tester.py b/tester.py
index 99293cde7d48f4f0be9eb14cd7cec733ecc4d3a1..e71bbabd3d411c9dd66190e6c38d4d1a80b80440 100755
--- a/tester.py
+++ b/tester.py
@@ -191,7 +191,7 @@ class Tester():
             if not hostname:
                 log('Failed to get hostname (required to send email).')
                 return 1
-            hostname = hostname.decode('utf-8')
+            hostname = hostname.decode('utf-8').strip()
             recipients = utils.get_conf('EMAIL_ADMINS')
             if not recipients:
                 log('No recipients defined for email sending. Set a value for EMAIL_ADMINS.')