diff --git a/client/lib/keyboard.js b/client/lib/keyboard.js
old mode 100755
new mode 100644
diff --git a/server/tests/utils.tests.js b/server/lib/tests/Utils.tests.js
similarity index 99%
rename from server/tests/utils.tests.js
rename to server/lib/tests/Utils.tests.js
index 3ad629d9a..7abc946a8 100644
--- a/server/tests/utils.tests.js
+++ b/server/lib/tests/Utils.tests.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 import { Random } from 'meteor/random';
 import { expect } from 'chai';
-import './utils';
+import '../utils';
 
 describe('utils', function() {
   describe(allowIsBoardAdmin.name, function() {
diff --git a/server/lib/tests/index.js b/server/lib/tests/index.js
new file mode 100644
index 000000000..23051aa8c
--- /dev/null
+++ b/server/lib/tests/index.js
@@ -0,0 +1 @@
+import './Utils.tests';
diff --git a/tests/main.js b/tests/main.js
index a891be487..1d639bd73 100644
--- a/tests/main.js
+++ b/tests/main.js
@@ -19,7 +19,7 @@
 
 if (Meteor.isServer) {
   describe('server', function() {
-    import '../server/tests/utils.tests';
+    import '../server/lib/tests';
   });
 }