diff --git a/oni-core.el b/oni-core.el
index 2918bd5..512dc4d 100644
--- a/oni-core.el
+++ b/oni-core.el
@@ -4,8 +4,8 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.0909.084822
-;; Package-Requires: (oni-data-dir expand-region multiple-cursors embrace gcmh)
+;; Version: 2020.1015.100916
+;; Package-Requires: (oni-data-dir expand-region multiple-cursors embrace gcmh diminish)
 
 ;; 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
@@ -27,6 +27,7 @@
 
 ;;; Code:
 
+(require 'diminish)
 (require 'gcmh)
 (require 'oni-data-dir)
 (require 'recentf)
@@ -153,6 +154,8 @@
   (setq oni-core--recentf-idle-timer
         (run-with-idle-timer 10 t #'oni-core-recentf-save-list-silently)))
 
+(diminish 'gcmh-mode)
+
 (electric-indent-mode -1)
 (winner-mode)
 (recentf-mode)
diff --git a/test/integration/oni-core.bats b/test/integration/oni-core.bats
old mode 100644
new mode 100755
index 7e52d86..adf6a4f
--- a/test/integration/oni-core.bats
+++ b/test/integration/oni-core.bats
@@ -26,3 +26,12 @@
 
     [[ "$output" == *"oni-core-move-end-of-dwim" ]]
 }
+
+@test "Starting Emacs diminishes gcmh-mode" {
+    run emacs -batch -l package -f package-initialize -l subr-x \
+        -eval "(prin1 (string-empty-p (car (alist-get 'gcmh-mode minor-mode-alist))))"
+
+    echo "$output"
+
+    [[ "$output" == *"t" ]]
+}