diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d1cd2cc..a5329b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -267,6 +267,13 @@ integration-test-oni-docker:
     - package
   script: make integration-test-oni-docker TEST_ARCHIVE=$(realpath bin/)
 
+integration-test-oni-haskell:
+  stage: integration-test
+  image: registry.gitlab.com/ryuslash/emacs-config
+  dependencies:
+    - package
+  script: make integration-test-oni-haskell TEST_ARCHIVE=$(realpath bin/)
+
 integration-test-oni-json:
   stage: integration-test
   image: registry.gitlab.com/ryuslash/emacs-config
diff --git a/oni-haskell.el b/oni-haskell.el
new file mode 100644
index 0000000..f926001
--- /dev/null
+++ b/oni-haskell.el
@@ -0,0 +1,32 @@
+;;; oni-haskell.el --- Haskell configuration         -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2020  Tom Willemse
+
+;; Author: Tom Willemse <tom@ryuslash.org>
+;; Keywords: local
+;; Version: 2020.0329.215543
+;; Package-Requires: (haskell-mode)
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Configuration for editing file in the Haskell language.
+
+;;; Code:
+
+;;;###autoload(with-eval-after-load 'haskell-mode (require 'oni-haskell))
+
+(provide 'oni-haskell)
+;;; oni-haskell.el ends here
diff --git a/test/integration/oni-haskell.bats b/test/integration/oni-haskell.bats
new file mode 100644
index 0000000..a7aec3a
--- /dev/null
+++ b/test/integration/oni-haskell.bats
@@ -0,0 +1,11 @@
+#!/usr/bin/env bats
+
+@test "Opening a .hs file loads oni-haskell" {
+    run emacs -batch -l package -f package-initialize \
+        -visit test.hs \
+        -eval "(prin1 (featurep 'oni-haskell))"
+
+    echo "$output"
+
+    [[ "$output" == *"t" ]]
+}