diff --git a/packages/xo-server-usage-report/.gitignore b/packages/xo-server-usage-report/.gitignore
index fa69f37f1..827e4e420 100644
--- a/packages/xo-server-usage-report/.gitignore
+++ b/packages/xo-server-usage-report/.gitignore
@@ -3,3 +3,5 @@
 
 npm-debug.log
 npm-debug.log.*
+pnpm-debug.log
+pnpm-debug.log.*
diff --git a/packages/xo-server-usage-report/.mocha.js b/packages/xo-server-usage-report/.mocha.js
deleted file mode 100644
index e6d84e403..000000000
--- a/packages/xo-server-usage-report/.mocha.js
+++ /dev/null
@@ -1,5 +0,0 @@
-Error.stackTraceLimit = 100
-
-try { require('trace') } catch (_) {}
-try { require('clarify') } catch (_) {}
-try { require('source-map-support/register') } catch (_) {}
diff --git a/packages/xo-server-usage-report/.mocha.opts b/packages/xo-server-usage-report/.mocha.opts
deleted file mode 100644
index 6cfd94898..000000000
--- a/packages/xo-server-usage-report/.mocha.opts
+++ /dev/null
@@ -1 +0,0 @@
---require ./.mocha.js
diff --git a/packages/xo-server-usage-report/.npmignore b/packages/xo-server-usage-report/.npmignore
index c31ee82cb..2304f1281 100644
--- a/packages/xo-server-usage-report/.npmignore
+++ b/packages/xo-server-usage-report/.npmignore
@@ -1,9 +1,21 @@
+/benchmark/
+/benchmarks/
+*.bench.js
+*.bench.js.map
+
 /examples/
 example.js
 example.js.map
 *.example.js
 *.example.js.map
 
+/fixture/
+/fixtures/
+*.fixture.js
+*.fixture.js.map
+*.fixtures.js
+*.fixtures.js.map
+
 /test/
 /tests/
 *.spec.js
diff --git a/packages/xo-server-usage-report/.travis.yml b/packages/xo-server-usage-report/.travis.yml
index fb5d91729..1a582c426 100644
--- a/packages/xo-server-usage-report/.travis.yml
+++ b/packages/xo-server-usage-report/.travis.yml
@@ -1,7 +1,8 @@
 language: node_js
 node_js:
-  - 'stable'
-  - '4'
+  - stable
+  - 6
+  - 4
 
 # Use containers.
 # http://docs.travis-ci.com/user/workers/container-based-infrastructure/
diff --git a/packages/xo-server-usage-report/README.md b/packages/xo-server-usage-report/README.md
index d811985b1..e16f7df78 100644
--- a/packages/xo-server-usage-report/README.md
+++ b/packages/xo-server-usage-report/README.md
@@ -1,13 +1,13 @@
-# ${pkg.name} [![Build Status](https://travis-ci.org/${pkg.shortGitHubPath}.png?branch=master)](https://travis-ci.org/${pkg.shortGitHubPath})
+# xo-server-usage-report [![Build Status](https://travis-ci.org/vatesfr/xo-server-usage-report.png?branch=master)](https://travis-ci.org/vatesfr/xo-server-usage-report)
 
 > ${pkg.description}
 
 ## Install
 
-Installation of the [npm package](https://npmjs.org/package/${pkg.name}):
+Installation of the [npm package](https://npmjs.org/package/xo-server-usage-report):
 
 ```
-> npm install --save ${pkg.name}
+> npm install --save xo-server-usage-report
 ```
 
 ## Usage
@@ -16,24 +16,21 @@ Installation of the [npm package](https://npmjs.org/package/${pkg.name}):
 
 ## Development
 
-### Installing dependencies
-
 ```
+# Install dependencies
 > npm install
-```
 
-### Compilation
+# Run the tests
+> npm test
 
-The sources files are watched and automatically recompiled on changes.
-
-```
+# Continuously compile
 > npm run dev
-```
 
-### Tests
+# Continuously run the tests
+> npm run dev-test
 
-```
-> npm run test-dev
+# Build for production (automatically called by npm install)
+> npm run build
 ```
 
 ## Contributions
@@ -43,10 +40,10 @@ the code.
 
 You may:
 
-- report any [issue](${pkg.bugs})
+- report any [issue](https://github.com/vatesfr/xo-server-usage-report/issues)
   you've encountered;
 - fork and create a pull request.
 
 ## License
 
-${pkg.license} © [${pkg.author.name}](${pkg.author.url})
+AGPL3 © [Vates SAS](http://vates.fr)
diff --git a/packages/xo-server-usage-report/package.json b/packages/xo-server-usage-report/package.json
index 47b898c23..0babedff4 100644
--- a/packages/xo-server-usage-report/package.json
+++ b/packages/xo-server-usage-report/package.json
@@ -4,12 +4,20 @@
   "version": "0.0.0",
   "license": "ISC",
   "description": "",
-  "keywords": [],
-  "homepage": "",
-  "bugs": "",
+  "keywords": [
+    "orchestra",
+    "plugin",
+    "report",
+    "usage",
+    "xen",
+    "xen",
+    "xen-orchestra"
+  ],
+  "homepage": "https://github.com/vatesfr/xo-server-usage-report",
+  "bugs": "https://github.com/vatesfr/xo-server-usage-report/issues",
   "repository": {
     "type": "git",
-    "url": ""
+    "url": "https://github.com/vatesfr/xo-server-usage-report.git"
   },
   "author": {
     "name": "Julien Fontanet",
@@ -25,43 +33,47 @@
     "node": ">=4"
   },
   "dependencies": {
-    "babel-runtime": "^6.3.19",
-    "lodash": "^4.16.2",
+    "babel-runtime": "^6.18.0",
+    "lodash": "^4.17.2",
     "promise-toolbox": "^0.7.0"
   },
   "devDependencies": {
-    "babel-cli": "^6.3.17",
-    "babel-eslint": "^7.0.0",
-    "babel-plugin-lodash": "^3.2.9",
-    "babel-plugin-transform-runtime": "^6.3.13",
-    "babel-preset-es2015": "^6.3.13",
-    "babel-preset-stage-0": "^6.3.13",
-    "clarify": "^2.0.0",
-    "dependency-check": "^2.5.1",
+    "babel-cli": "^6.18.0",
+    "babel-eslint": "^7.1.1",
+    "babel-plugin-lodash": "^3.2.10",
+    "babel-plugin-transform-runtime": "^6.15.0",
+    "babel-preset-env": "^0.0.9",
+    "babel-preset-stage-0": "^6.16.0",
+    "cross-env": "^3.1.3",
+    "dependency-check": "^2.6.0",
     "ghooks": "^1.3.2",
-    "mocha": "^3.1.0",
-    "must": "^0.13.1",
-    "source-map-support": "^0.4.0",
-    "standard": "^8.2.0",
-    "trace": "^2.0.2"
+    "rimraf": "^2.5.4",
+    "standard": "^8.6.0"
   },
   "scripts": {
-    "build": "babel --source-maps --out-dir=dist/ src/",
+    "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",
+    "clean": "rimraf dist/",
     "depcheck": "dependency-check ./package.json",
-    "dev": "babel --watch --source-maps --out-dir=dist/ src/",
-    "dev-test": "mocha --opts .mocha.opts --watch --reporter=min \"dist/**/*.spec.js\"",
+    "dev": "cross-env NODE_ENV=development babel --watch --source-maps --out-dir=dist/ src/",
     "lint": "standard",
     "posttest": "npm run lint && npm run depcheck",
-    "prepublish": "npm run build",
-    "test": "mocha --opts .mocha.opts \"dist/**/*.spec.js\""
+    "prebuild": "npm run clean",
+    "predev": "npm run clean",
+    "prepublish": "npm run build"
   },
   "babel": {
     "plugins": [
-      "transform-runtime",
       "lodash"
     ],
     "presets": [
-      "es2015",
+      [
+        "env",
+        {
+          "targets": {
+            "node": 4
+          }
+        }
+      ],
       "stage-0"
     ]
   },
diff --git a/packages/xo-server-usage-report/src/index.spec.js b/packages/xo-server-usage-report/src/index.spec.js
deleted file mode 100644
index 2319bd7d5..000000000
--- a/packages/xo-server-usage-report/src/index.spec.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/* eslint-env mocha */
-
-import expect from 'must'
-
-// ===================================================================
-
-import myLib from './'
-
-// ===================================================================
-
-describe.skip('myLib', () => {
-  it('does something', () => {
-    // TODO: some real tests.
-
-    expect(myLib).to.exists()
-  })
-})