diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b91998..66ce5be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,31 @@
 # Changelog
 
+## [1.7.0](https://github.com/openeuropa/code-review/tree/1.7.0) (2021-07-19)
+
+[Full Changelog](https://github.com/openeuropa/code-review/compare/1.6.0...1.7.0)
+
+**Merged pull requests:**
+
+- EWPP-1288: Unlock drupal/coder package. [\#135](https://github.com/openeuropa/code-review/pull/135) ([sergepavle](https://github.com/sergepavle))
+
+## [1.6.0](https://github.com/openeuropa/code-review/tree/1.6.0) (2021-04-21)
+
+[Full Changelog](https://github.com/openeuropa/code-review/compare/1.5.0...1.6.0)
+
+**Merged pull requests:**
+
+- Update CHANGELOG.md for release 1.6.0. [\#133](https://github.com/openeuropa/code-review/pull/133) ([ademarco](https://github.com/ademarco))
+- EWPP-721: Update xdebug configuration. [\#130](https://github.com/openeuropa/code-review/pull/130) ([22Alexandra](https://github.com/22Alexandra))
+- EWPP-372: Fix drupal type file extensions to be checked. [\#129](https://github.com/openeuropa/code-review/pull/129) ([nagyad](https://github.com/nagyad))
+- EWPP-516: Update docker images. [\#125](https://github.com/openeuropa/code-review/pull/125) ([22Alexandra](https://github.com/22Alexandra))
+
 ## [1.5.0](https://github.com/openeuropa/code-review/tree/1.5.0) (2020-09-07)
 
 [Full Changelog](https://github.com/openeuropa/code-review/compare/1.4.0...1.5.0)
 
 **Merged pull requests:**
 
+- Release-1.5.0: Update changelog. [\#121](https://github.com/openeuropa/code-review/pull/121) ([nagyad](https://github.com/nagyad))
 - EWPP: Lock drupal/coder version to 8.3.9. [\#120](https://github.com/openeuropa/code-review/pull/120) ([nagyad](https://github.com/nagyad))
 
 ## [1.4.0](https://github.com/openeuropa/code-review/tree/1.4.0) (2020-09-02)
diff --git a/tests/PhpCodeSnifferDrupalTest.php b/tests/PhpCodeSnifferDrupalTest.php
index 233ee24..9151747 100644
--- a/tests/PhpCodeSnifferDrupalTest.php
+++ b/tests/PhpCodeSnifferDrupalTest.php
@@ -49,6 +49,71 @@ public function dataProvider()
                     ],
                 ],
             ],
+            [
+                'phpcs/drupal.inc',
+                'drupal-conventions',
+                [
+                    'error' => [
+                        1 => 1,
+                        9 => 2,
+                    ],
+                    'warning' => [
+                        3 => 1,
+                    ],
+                ],
+            ],
+            [
+                'phpcs/drupal.install',
+                'drupal-conventions',
+                [
+                    'error' => [
+                        1 => 1,
+                        9 => 2,
+                    ],
+                    'warning' => [
+                        3 => 1,
+                    ],
+                ],
+            ],
+            [
+                'phpcs/drupal.module',
+                'drupal-conventions',
+                [
+                    'error' => [
+                        1 => 1,
+                        9 => 2,
+                    ],
+                    'warning' => [
+                        3 => 1,
+                    ],
+                ],
+            ],
+            [
+                'phpcs/drupal.profile',
+                'drupal-conventions',
+                [
+                    'error' => [
+                        1 => 1,
+                        9 => 2,
+                    ],
+                    'warning' => [
+                        3 => 1,
+                    ],
+                ],
+            ],
+            [
+                'phpcs/drupal.theme',
+                'drupal-conventions',
+                [
+                    'error' => [
+                        1 => 1,
+                        9 => 2,
+                    ],
+                    'warning' => [
+                        3 => 1,
+                    ],
+                ],
+            ],
         ];
     }
 }
diff --git a/tests/config/grumphp.yml.dist b/tests/config/grumphp.yml.dist
index e7176c9..ece6b25 100644
--- a/tests/config/grumphp.yml.dist
+++ b/tests/config/grumphp.yml.dist
@@ -3,4 +3,11 @@ imports:
 
 parameters:
   tasks.phpmd.ruleset:
-  - ./resources/phpmd-ruleset.xml
+    - ./resources/phpmd-ruleset.xml
+  tasks.phpcs.triggered_by:
+    - php
+    - module
+    - inc
+    - theme
+    - install
+    - profile
diff --git a/tests/fixtures/phpcs/drupal.inc b/tests/fixtures/phpcs/drupal.inc
new file mode 100644
index 0000000..cb1f2fd
--- /dev/null
+++ b/tests/fixtures/phpcs/drupal.inc
@@ -0,0 +1,10 @@
+<?php
+
+use Drupal\BlockBase;
+
+/**
+ * Some hook implementation.
+ */
+function drupal_hook() {
+    return true;
+}
diff --git a/tests/fixtures/phpcs/drupal.install b/tests/fixtures/phpcs/drupal.install
new file mode 100644
index 0000000..cb1f2fd
--- /dev/null
+++ b/tests/fixtures/phpcs/drupal.install
@@ -0,0 +1,10 @@
+<?php
+
+use Drupal\BlockBase;
+
+/**
+ * Some hook implementation.
+ */
+function drupal_hook() {
+    return true;
+}
diff --git a/tests/fixtures/phpcs/drupal.module b/tests/fixtures/phpcs/drupal.module
new file mode 100644
index 0000000..cb1f2fd
--- /dev/null
+++ b/tests/fixtures/phpcs/drupal.module
@@ -0,0 +1,10 @@
+<?php
+
+use Drupal\BlockBase;
+
+/**
+ * Some hook implementation.
+ */
+function drupal_hook() {
+    return true;
+}
diff --git a/tests/fixtures/phpcs/drupal.profile b/tests/fixtures/phpcs/drupal.profile
new file mode 100644
index 0000000..cb1f2fd
--- /dev/null
+++ b/tests/fixtures/phpcs/drupal.profile
@@ -0,0 +1,10 @@
+<?php
+
+use Drupal\BlockBase;
+
+/**
+ * Some hook implementation.
+ */
+function drupal_hook() {
+    return true;
+}
diff --git a/tests/fixtures/phpcs/drupal.theme b/tests/fixtures/phpcs/drupal.theme
new file mode 100644
index 0000000..cb1f2fd
--- /dev/null
+++ b/tests/fixtures/phpcs/drupal.theme
@@ -0,0 +1,10 @@
+<?php
+
+use Drupal\BlockBase;
+
+/**
+ * Some hook implementation.
+ */
+function drupal_hook() {
+    return true;
+}