diff --git a/routes/index.js b/routes/index.js
index 549b698..d0adc26 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -6,7 +6,7 @@ var router = express.Router();
 router.get('/', function(req, res) {
   res.render('index', {
     title: 'Crafatar',
-    domain: "https://" + req.headers.host,
+    domain: req.secure ? "https" : "http" + "://" + req.headers.host,
     config: config
   });
 });
diff --git a/test/test.js b/test/test.js
index 6494e3c..b040a41 100644
--- a/test/test.js
+++ b/test/test.js
@@ -14,8 +14,8 @@ config.http_timeout *= 3;
 // no spam
 logging.log = function(){};
 
-var uuids = fs.readFileSync('test/uuids.txt').toString().split("\n");
-var usernames = fs.readFileSync('test/usernames.txt').toString().split("\n");
+var uuids = fs.readFileSync('test/uuids.txt').toString().split("\r\n");
+var usernames = fs.readFileSync('test/usernames.txt').toString().split("\r\n");
 // Get a random UUID + username in order to prevent rate limiting
 var uuid = uuids[Math.round(Math.random() * (uuids.length - 1))];
 console.log("using uuid '" + uuid + "'");