diff --git a/.eslintrc b/.eslintrc
index c06f6e872..8816abf6d 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -26,7 +26,7 @@
 
     // Code style
     "camelcase": ["error", {"properties": "always"}],
-    "comma-dangle": ["error", "always-multiline"],
+    "comma-dangle": ["warn", "always-multiline"],
     "comma-spacing": ["error", {"before": false, "after": true}],
     "dot-notation": ["error", {"allowKeywords": true, "allowPattern": ""}],
     "eol-last": ["error", "always"],
diff --git a/test/crowdsale/AllowanceCrowdsale.test.js b/test/crowdsale/AllowanceCrowdsale.test.js
index 4a53c5f97..048e4d9fa 100644
--- a/test/crowdsale/AllowanceCrowdsale.test.js
+++ b/test/crowdsale/AllowanceCrowdsale.test.js
@@ -42,7 +42,7 @@ contract('AllowanceCrowdsale', function ([_, investor, wallet, purchaser, tokenW
         purchaser: investor,
         beneficiary: investor,
         value: value,
-        amount: expectedTokenAmount,
+        amount: expectedTokenAmount
       });
     });
 
diff --git a/test/crowdsale/Crowdsale.test.js b/test/crowdsale/Crowdsale.test.js
index dbd33f1aa..53721fcf3 100644
--- a/test/crowdsale/Crowdsale.test.js
+++ b/test/crowdsale/Crowdsale.test.js
@@ -83,7 +83,7 @@ contract('Crowdsale', function ([_, investor, wallet, purchaser]) {
             purchaser: investor,
             beneficiary: investor,
             value: value,
-            amount: expectedTokenAmount,
+            amount: expectedTokenAmount
           });
         });
 
@@ -106,7 +106,7 @@ contract('Crowdsale', function ([_, investor, wallet, purchaser]) {
             purchaser: purchaser,
             beneficiary: investor,
             value: value,
-            amount: expectedTokenAmount,
+            amount: expectedTokenAmount
           });
         });
 
diff --git a/test/crowdsale/MintedCrowdsale.behavior.js b/test/crowdsale/MintedCrowdsale.behavior.js
index ec41e4948..8fee5b35b 100644
--- a/test/crowdsale/MintedCrowdsale.behavior.js
+++ b/test/crowdsale/MintedCrowdsale.behavior.js
@@ -21,7 +21,7 @@ function shouldBehaveLikeMintedCrowdsale ([_, investor, wallet, purchaser], rate
           purchaser: investor,
           beneficiary: investor,
           value: value,
-          amount: expectedTokenAmount,
+          amount: expectedTokenAmount
         });
       });
 
diff --git a/test/payment/escrow/Escrow.behavior.js b/test/payment/escrow/Escrow.behavior.js
index 80bde2f5c..08f032472 100644
--- a/test/payment/escrow/Escrow.behavior.js
+++ b/test/payment/escrow/Escrow.behavior.js
@@ -31,7 +31,7 @@ function shouldBehaveLikeEscrow (primary, [payee1, payee2]) {
         const { logs } = await this.escrow.deposit(payee1, { from: primary, value: amount });
         expectEvent.inLogs(logs, 'Deposited', {
           payee: payee1,
-          weiAmount: amount,
+          weiAmount: amount
         });
       });
 
@@ -80,7 +80,7 @@ function shouldBehaveLikeEscrow (primary, [payee1, payee2]) {
         const { logs } = await this.escrow.withdraw(payee1, { from: primary });
         expectEvent.inLogs(logs, 'Withdrawn', {
           payee: payee1,
-          weiAmount: amount,
+          weiAmount: amount
         });
       });
     });
diff --git a/test/token/ERC20/ERC20.test.js b/test/token/ERC20/ERC20.test.js
index 16d2cab75..3ddd1362a 100644
--- a/test/token/ERC20/ERC20.test.js
+++ b/test/token/ERC20/ERC20.test.js
@@ -60,7 +60,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
           expectEvent.inLogs(logs, 'Transfer', {
             from: owner,
             to: to,
-            value: amount,
+            value: amount
           });
         });
       });
@@ -88,7 +88,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
           expectEvent.inLogs(logs, 'Approval', {
             owner: owner,
             spender: spender,
-            value: amount,
+            value: amount
           });
         });
 
@@ -122,7 +122,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
           expectEvent.inLogs(logs, 'Approval', {
             owner: owner,
             spender: spender,
-            value: amount,
+            value: amount
           });
         });
 
@@ -192,7 +192,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
             expectEvent.inLogs(logs, 'Transfer', {
               from: owner,
               to: to,
-              value: amount,
+              value: amount
             });
           });
 
@@ -277,7 +277,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
             expectEvent.inLogs(logs, 'Approval', {
               owner: owner,
               spender: spender,
-              value: 0,
+              value: 0
             });
           });
 
@@ -334,7 +334,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
           expectEvent.inLogs(logs, 'Approval', {
             owner: owner,
             spender: spender,
-            value: amount,
+            value: amount
           });
         });
 
@@ -368,7 +368,7 @@ contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
           expectEvent.inLogs(logs, 'Approval', {
             owner: owner,
             spender: spender,
-            value: amount,
+            value: amount
           });
         });
 
diff --git a/test/token/ERC20/behaviors/ERC20Burnable.behavior.js b/test/token/ERC20/behaviors/ERC20Burnable.behavior.js
index 6d1c7195b..26f2ee741 100644
--- a/test/token/ERC20/behaviors/ERC20Burnable.behavior.js
+++ b/test/token/ERC20/behaviors/ERC20Burnable.behavior.js
@@ -28,7 +28,7 @@ function shouldBehaveLikeERC20Burnable (owner, initialBalance, [burner]) {
           expectEvent.inLogs(this.logs, 'Transfer', {
             from: owner,
             to: ZERO_ADDRESS,
-            value: amount,
+            value: amount
           });
         });
       }
@@ -74,7 +74,7 @@ function shouldBehaveLikeERC20Burnable (owner, initialBalance, [burner]) {
           expectEvent.inLogs(this.logs, 'Transfer', {
             from: owner,
             to: ZERO_ADDRESS,
-            value: amount,
+            value: amount
           });
         });
       }
diff --git a/test/token/ERC20/behaviors/ERC20Mintable.behavior.js b/test/token/ERC20/behaviors/ERC20Mintable.behavior.js
index 987b67752..933487071 100644
--- a/test/token/ERC20/behaviors/ERC20Mintable.behavior.js
+++ b/test/token/ERC20/behaviors/ERC20Mintable.behavior.js
@@ -33,7 +33,7 @@ function shouldBehaveLikeERC20Mintable (minter, [anyone]) {
             expectEvent.inLogs(this.logs, 'Transfer', {
               from: ZERO_ADDRESS,
               to: anyone,
-              value: amount,
+              value: amount
             });
           });
         }
diff --git a/test/token/ERC721/ERC721.behavior.js b/test/token/ERC721/ERC721.behavior.js
index b7600872c..7850464b2 100644
--- a/test/token/ERC721/ERC721.behavior.js
+++ b/test/token/ERC721/ERC721.behavior.js
@@ -87,7 +87,7 @@ function shouldBehaveLikeERC721 (
             expectEvent.inLogs(logs, 'Transfer', {
               from: owner,
               to: this.toWhom,
-              tokenId: tokenId,
+              tokenId: tokenId
             });
           });
         } else {
@@ -95,7 +95,7 @@ function shouldBehaveLikeERC721 (
             expectEvent.inLogs(logs, 'Transfer', {
               from: owner,
               to: this.toWhom,
-              tokenId: tokenId,
+              tokenId: tokenId
             });
           });
         }
@@ -160,7 +160,7 @@ function shouldBehaveLikeERC721 (
             expectEvent.inLogs(logs, 'Transfer', {
               from: owner,
               to: owner,
-              tokenId: tokenId,
+              tokenId: tokenId
             });
           });
 
@@ -336,7 +336,7 @@ function shouldBehaveLikeERC721 (
           expectEvent.inLogs(logs, 'Approval', {
             owner: owner,
             approved: address,
-            tokenId: tokenId,
+            tokenId: tokenId
           });
         });
       };
@@ -446,7 +446,7 @@ function shouldBehaveLikeERC721 (
             expectEvent.inLogs(logs, 'ApprovalForAll', {
               owner: owner,
               operator: operator,
-              approved: true,
+              approved: true
             });
           });
         });
@@ -468,7 +468,7 @@ function shouldBehaveLikeERC721 (
             expectEvent.inLogs(logs, 'ApprovalForAll', {
               owner: owner,
               operator: operator,
-              approved: true,
+              approved: true
             });
           });
 
@@ -496,7 +496,7 @@ function shouldBehaveLikeERC721 (
             expectEvent.inLogs(logs, 'ApprovalForAll', {
               owner: owner,
               operator: operator,
-              approved: true,
+              approved: true
             });
           });
         });
diff --git a/test/token/ERC721/ERC721MintBurn.behavior.js b/test/token/ERC721/ERC721MintBurn.behavior.js
index 97c33ae36..dc3f496c7 100644
--- a/test/token/ERC721/ERC721MintBurn.behavior.js
+++ b/test/token/ERC721/ERC721MintBurn.behavior.js
@@ -41,7 +41,7 @@ function shouldBehaveLikeMintAndBurnERC721 (
           expectEvent.inLogs(logs, 'Transfer', {
             from: ZERO_ADDRESS,
             to: newOwner,
-            tokenId: thirdTokenId,
+            tokenId: thirdTokenId
           });
         });
       });
@@ -86,7 +86,7 @@ function shouldBehaveLikeMintAndBurnERC721 (
           expectEvent.inLogs(logs, 'Transfer', {
             from: owner,
             to: ZERO_ADDRESS,
-            tokenId: tokenId,
+            tokenId: tokenId
           });
         });
       });