diff --git a/Gruntfile.js b/Gruntfile.js
index 95e327054..97ee125bd 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -102,6 +102,7 @@ module.exports = grunt => {
       libloki: {
         src: [
           'libloki/api.js',
+          'libloki/friends.js',
           'libloki/crypto.js',
           'libloki/service_nodes.js',
           'libloki/storage.js',
diff --git a/js/models/conversations.js b/js/models/conversations.js
index 411ef228f..7f510916e 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -41,8 +41,7 @@
   } = window.Signal.Migrations;
 
   // Possible conversation friend states
-  const FriendRequestStatusEnum =
-    window.libloki.friends.friendRequestStatusEnum;
+  const FriendRequestStatusEnum = window.friends.friendRequestStatusEnum;
 
   // Possible session reset states
   const SessionResetEnum = Object.freeze({
diff --git a/libloki/api.js b/libloki/api.js
index 20ba72622..838ffdfb6 100644
--- a/libloki/api.js
+++ b/libloki/api.js
@@ -10,7 +10,7 @@
 
   async function broadcastOnlineStatus() {
     const friendKeys = await window.Signal.Data.getPubKeysWithFriendStatus(
-      friendRequestStatusEnum.friends
+      window.friends.friendRequestStatusEnum.friends
     );
     friendKeys.forEach(pubKey => {
       sendOnlineBroadcastMessage(pubKey);
@@ -90,28 +90,10 @@
     }
   }
 
-  // Possible conversation friend states
-  const friendRequestStatusEnum = Object.freeze({
-    // New conversation, no messages sent or received
-    none: 0,
-    // This state is used to lock the input early while sending
-    pendingSend: 1,
-    // Friend request sent, awaiting response
-    requestSent: 2,
-    // Friend request received, awaiting user input
-    requestReceived: 3,
-    // We did it!
-    friends: 4,
-  });
-
   window.libloki.api = {
     sendFriendRequestAccepted,
     sendEmptyMessage,
     sendOnlineBroadcastMessage,
     broadcastOnlineStatus,
   };
-
-  window.libloki.friends = {
-    friendRequestStatusEnum,
-  };
 })();
diff --git a/libloki/friends.js b/libloki/friends.js
new file mode 100644
index 000000000..95b210382
--- /dev/null
+++ b/libloki/friends.js
@@ -0,0 +1,22 @@
+/* global window */
+
+// eslint-disable-next-line func-names
+(function() {
+  // Possible conversation friend states
+  const friendRequestStatusEnum = Object.freeze({
+    // New conversation, no messages sent or received
+    none: 0,
+    // This state is used to lock the input early while sending
+    pendingSend: 1,
+    // Friend request sent, awaiting response
+    requestSent: 2,
+    // Friend request received, awaiting user input
+    requestReceived: 3,
+    // We did it!
+    friends: 4,
+  });
+
+  window.friends = {
+    friendRequestStatusEnum,
+  };
+})();
diff --git a/test/index.html b/test/index.html
index 80e223b1c..c541e717b 100644
--- a/test/index.html
+++ b/test/index.html
@@ -360,6 +360,7 @@
   <script type="text/javascript" src="../js/storage.js" data-cover></script>
   <script type="text/javascript" src="../js/signal_protocol_store.js" data-cover></script>
   <script type="text/javascript" src="../js/libtextsecure.js" data-cover></script>
+  <script type="text/javascript" src="../js/libloki.js" data-cover></script>
 
   <script type="text/javascript" src="../js/libphonenumber-util.js"></script>
   <script type='text/javascript' src='../js/models/profile.js' data-cover></script>