diff --git a/gallery_dl/extractor/chronos.py b/gallery_dl/extractor/chronos.py
index af8d6653..36a84280 100644
--- a/gallery_dl/extractor/chronos.py
+++ b/gallery_dl/extractor/chronos.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2015 Mike Fährmann
+# Copyright 2015,2016 Mike Fährmann
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -11,32 +11,37 @@
 from .common import Extractor, Message
 from .. import text
 
-class ChronosExtractor(Extractor):
+class ChronosImageExtractor(Extractor):
 
     category = "chronos"
     directory_fmt = ["{category}"]
     filename_fmt = "{filename}"
     pattern = [r"(?:https?://)?(?:www\.)?chronos\.to/([a-z0-9]{12})"]
+    test = [("http://chronos.to/bdrmq7rw7v4y", {
+        "url": "7fcb3fe315c94283644d25ef47a644c2dc8da944",
+        "keyword": "9c364ef9bd962fe70eca49ef74c1c424486514f9",
+        "content": "0c8768055e4e20e7c7259608b67799171b691140",
+    })]
 
     def __init__(self, match):
         Extractor.__init__(self)
         self.token = match.group(1)
 
     def items(self):
-        params = {
-            "op": "view",
-            "id": self.token,
-            "pre": 1,
-            "next": "Continue to image.",
-        }
-        page = self.request("http://chronos.to/" + self.token, method="post",
-                            data=params).text
-        url     , pos = text.extract(page, '<img src="', '"')
-        filename, pos = text.extract(page, ' alt="', '"', pos)
         data = {
             "category": self.category,
             "token": self.token,
         }
+        params = {
+            "op": "view",
+            "id": self.token,
+            "pre": 1,
+            "next": "Continue+to+image.",
+        }
+        page = self.request("http://chronos.to/" + self.token, method="post",
+                            data=params).text
+        url     , pos = text.extract(page, '<br><img src="', '"')
+        filename, pos = text.extract(page, ' alt="', '"', pos)
         text.nameext_from_url(filename, data)
         yield Message.Version, 1
         yield Message.Directory, data