From a07c29c0699951881f4f0c510a7c998fbf576bc1 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 9 Dec 2017 14:38:06 -0500
Subject: [PATCH] Fix lang/org unit tests

---
 init.test.el                          | 4 +---
 modules/lang/org/test/autoload-org.el | 2 +-
 modules/lang/org/test/org.el          | 8 +++++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/init.test.el b/init.test.el
index 9cba1cfc6..038114c87 100644
--- a/init.test.el
+++ b/init.test.el
@@ -13,10 +13,8 @@
        password-store
 
        :lang
-       web
-
-       :org
        org
+       web
 
        :private
        hlissner)
diff --git a/modules/lang/org/test/autoload-org.el b/modules/lang/org/test/autoload-org.el
index d9ac443d0..2402f9aac 100644
--- a/modules/lang/org/test/autoload-org.el
+++ b/modules/lang/org/test/autoload-org.el
@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
-;;; org/org/test/autoload-org.el
+;;; lang/org/test/autoload-org.el
 
 (defmacro should-org-buffer! (source expected &rest body)
   `(should-buffer! ,source ,expected
diff --git a/modules/lang/org/test/org.el b/modules/lang/org/test/org.el
index d91044ff9..e69f7a261 100644
--- a/modules/lang/org/test/org.el
+++ b/modules/lang/org/test/org.el
@@ -1,5 +1,7 @@
-;;; org/org/test/org.el -*- lexical-binding: t; -*-
+;;; lang/org/test/org.el -*- lexical-binding: t; -*-
+
+(when (featurep 'org)
+  (unload-feature 'org t))
+(require! :lang org)
 
-(when (featurep 'org) (unload-feature 'org t))
-(require! :org org)
 (require 'org (locate-library "org" nil doom--package-load-path))