diff --git a/src/transformTokens.js b/src/transformTokens.js
index d93dcf8..aadbd1b 100644
--- a/src/transformTokens.js
+++ b/src/transformTokens.js
@@ -36,7 +36,7 @@ exports.transformTokens = transformTokens;
  * @return {string}
  */
 function camelizeDashes(str) {
-  return str.replace(/-(\w)/g, (m, letter) => letter.toUpperCase());
+  return str.replace(/-+(\w)/g, (m, letter) => letter.toUpperCase());
 }
 
 /**
diff --git a/test/api/camelCase.js b/test/api/camelCase.js
index 6d5faa7..94194b9 100644
--- a/test/api/camelCase.js
+++ b/test/api/camelCase.js
@@ -23,7 +23,7 @@ suite('api/camelCase', () => {
     test('should replace keys with dashes by its camel-cased equivalent', () => {
       const tokens = require('./fixture/bem.css');
       assert.deepEqual(tokens, {
-        'block__element-Modifier': '_test_api_fixture_bem__block__element--modifier',
+        'block__elementModifier': '_test_api_fixture_bem__block__element--modifier',
       });
     });
 
diff --git a/test/api/generateScopedName.js b/test/api/generateScopedName.js
index a6d092e..c39faab 100644
--- a/test/api/generateScopedName.js
+++ b/test/api/generateScopedName.js
@@ -8,7 +8,7 @@ suite('api/generateScopedName', () => {
     let args;
     let tokens;
 
-    const processor = spy(function (selector, filepath, source) {
+    const processor = spy((selector, filepath, source) => {
       args = [selector, filepath, source];
       return selector;
     });
diff --git a/test/api/hashPrefix.js b/test/api/hashPrefix.js
index 87fdb7a..a2a5ec4 100644
--- a/test/api/hashPrefix.js
+++ b/test/api/hashPrefix.js
@@ -2,7 +2,7 @@ const detachHook = require('../sugar').detachHook;
 const dropCache = require('../sugar').dropCache;
 
 suite('api/hashPrefix', () => {
-  let samples = [];
+  const samples = [];
 
   suite('using string pattern and hashPrefix', () => {
     let tokens;