diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 98d943a..04df165 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,10 @@ test-oni-grep:
   stage: test
   script: make test-oni-grep
 
+test-oni-highlight-indent-guides:
+  stage: test
+  script: make test-oni-highlight-indent-guides
+
 package:
   stage: package
   before_script:
diff --git a/oni-highlight-indent-guides.el b/oni-highlight-indent-guides.el
new file mode 100644
index 0000000..a695541
--- /dev/null
+++ b/oni-highlight-indent-guides.el
@@ -0,0 +1,36 @@
+;;; oni-highlight-indent-guides.el --- highlight-indent-guides configuration  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2019  Tom Willemse
+
+;; Author: Tom Willemse <tom@ryuslash.org>
+;; Keywords: local
+;; Version: 20190504235807
+;; Package-Requires: (highlight-indent-guides)
+
+;; 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 highlight-indent-guides.
+
+;;; Code:
+
+(require 'highlight-indent-guides)
+
+(setq highlight-indent-guides-method 'character)
+
+;;;###autoload(with-eval-after-load 'highlight-indent-guides (require 'oni-highlight-indent-guides))
+
+(provide 'oni-highlight-indent-guides)
+;;; oni-highlight-indent-guides.el ends here
diff --git a/oni-yaml.el b/oni-yaml.el
index 1f0b0a6..cce7b0c 100644
--- a/oni-yaml.el
+++ b/oni-yaml.el
@@ -4,8 +4,8 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 20190309160113
-;; Package-Requires: (yaml-mode oni-flycheck oni-fci flycheck-yamllint indent-tools yaml-imenu highlight-indent-guides)
+;; Version: 20190504235439
+;; Package-Requires: (yaml-mode oni-flycheck oni-fci oni-highlight-indent-guides flycheck-yamllint indent-tools yaml-imenu)
 
 ;; 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
diff --git a/test/oni-highlight-indent-guides-test.el b/test/oni-highlight-indent-guides-test.el
new file mode 100644
index 0000000..19fb792
--- /dev/null
+++ b/test/oni-highlight-indent-guides-test.el
@@ -0,0 +1,4 @@
+(ert-deftest oni-highlight-indent-guides-autoloads ()
+  "Thest that `oni-highlight-indent-guides' gets loaded automatically."
+  (require 'highlight-indent-guides)
+  (should (featurep 'oni-highlight-indent-guides)))