diff --git a/sigal/__init__.py b/sigal/__init__.py
index b7a11dc..4d4b2f5 100644
--- a/sigal/__init__.py
+++ b/sigal/__init__.py
@@ -102,8 +102,9 @@ def main():
                                           _DEFAULT_CONFIG_FILE))
 
     # create gallery
-    gallery = Gallery(settings, args.input_dir)
-    gallery.build(args.output_dir, force=args.force)
+    gallery = Gallery(settings, args.input_dir, args.output_dir,
+                      force=args.force)
+    gallery.build()
 
     r = Generator(settings, args.output_dir)
     r.generate()
diff --git a/sigal/gallery.py b/sigal/gallery.py
index 175da3d..7018443 100644
--- a/sigal/gallery.py
+++ b/sigal/gallery.py
@@ -35,9 +35,11 @@ DESCRIPTION_FILE = "index.md"
 class Gallery:
     "Prepare images"
 
-    def __init__(self, settings, input_dir):
+    def __init__(self, settings, input_dir, output_dir, force=False):
         self.settings = settings
+        self.force = force
         self.input_dir = os.path.abspath(input_dir)
+        self.output_dir = os.path.abspath(output_dir)
         self.logger = logging.getLogger(__name__)
 
     def filelist(self):
@@ -49,12 +51,9 @@ class Gallery:
                        if os.path.splitext(f)[1] in self.settings['fileextlist']]
             yield dirpath, dirnames, imglist
 
-    def build(self, output_dir, force=False):
+    def build(self):
         "create image gallery"
 
-        self.output_dir = os.path.abspath(output_dir)
-        self.force = force
-
         if not os.path.isdir(self.output_dir):
             self.logger.info("Create output directory %s", self.output_dir)
             os.makedirs(self.output_dir)
diff --git a/tests/test_image.py b/tests/test_image.py
index eb6c6af..6786c76 100644
--- a/tests/test_image.py
+++ b/tests/test_image.py
@@ -16,7 +16,8 @@ class TestGallery(unittest.TestCase):
         self.path = os.path.dirname(__file__)
         default_conf = os.path.join(self.path, 'sample', 'sigal.conf')
         settings = read_settings(default_conf)
-        self.gallery = Gallery(settings, os.path.join(self.path, 'sample'))
+        self.gallery = Gallery(settings, os.path.join(self.path, 'sample'),
+                               os.path.join(self.path, 'output'))
 
     def test_filelist(self):
         file_generator = self.gallery.filelist()