diff --git a/.travis.yml b/.travis.yml
index 96558d0..836395a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,4 +15,4 @@ before_script:
   - composer update --prefer-dist
 script:
   - vendor/bin/phpunit
-  - vendor/bin/phpcs -p --standard=$TRAVIS_BUILD_DIR/vendor/ongr/ongr-strict-standard/ONGR --ignore=vendor/,Tests/app/,Resources/public/ ./
+  - vendor/bin/phpcs -p --standard=vendor/ongr/ongr-strict-standard/Ongr --ignore=vendor/,Tests/app/,Resources/public/ ./
diff --git a/FlashBag/DirtyFlashBag.php b/FlashBag/DirtyFlashBag.php
index d8ed27a..05d0665 100644
--- a/FlashBag/DirtyFlashBag.php
+++ b/FlashBag/DirtyFlashBag.php
@@ -78,7 +78,7 @@ public function add($type, $message)
      * {@inheritdoc}
      *
      * @param string $type
-     * @param array $default
+     * @param array  $default
      */
     public function get($type, array $default = [])
     {
@@ -113,7 +113,7 @@ public function all()
      * {@inheritdoc}
      *
      * @param string $type
-     * @param array $messages
+     * @param array  $messages
      */
     public function set($type, $messages)
     {
diff --git a/Tests/Fixtures/Security/LoginTestHelper.php b/Tests/Fixtures/Security/LoginTestHelper.php
index 5f9f062..5881852 100644
--- a/Tests/Fixtures/Security/LoginTestHelper.php
+++ b/Tests/Fixtures/Security/LoginTestHelper.php
@@ -37,7 +37,7 @@ public function __construct(Client $client)
      * @param string $username
      * @param string $password
      *
-     * @return Client $client
+     * @return Client
      */
     public function loginAction($username = 'test', $password = 'test')
     {
diff --git a/Tests/Functional/Settings/Personal/PersonalProfilesProviderTest.php b/Tests/Functional/Settings/Personal/PersonalProfilesProviderTest.php
index 0bfd8ce..d912ffb 100644
--- a/Tests/Functional/Settings/Personal/PersonalProfilesProviderTest.php
+++ b/Tests/Functional/Settings/Personal/PersonalProfilesProviderTest.php
@@ -35,7 +35,7 @@ public function testGetPersonalProfilesProvider()
     /**
      * Get Container.
      *
-     * @return Service container
+     * @return Service Service container.
      */
     protected function getServiceContainer()
     {
diff --git a/Tests/Unit/DependencyInjection/ConfigurationTest.php b/Tests/Unit/DependencyInjection/ConfigurationTest.php
index 6db1d32..2126e03 100644
--- a/Tests/Unit/DependencyInjection/ConfigurationTest.php
+++ b/Tests/Unit/DependencyInjection/ConfigurationTest.php
@@ -31,7 +31,6 @@ public function configurationData()
         ];
 
         // A #0 test default values.
-
         $out[] = [
             [],
             [
diff --git a/Tests/Unit/Twig/ImagePathExtensionTest.php b/Tests/Unit/Twig/ImagePathExtensionTest.php
index d30466e..3d9bdd8 100755
--- a/Tests/Unit/Twig/ImagePathExtensionTest.php
+++ b/Tests/Unit/Twig/ImagePathExtensionTest.php
@@ -11,7 +11,6 @@
 
 namespace ONGR\SettingsBundle\Tests\Functional\Twig;
 
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use ONGR\SettingsBundle\Twig\ImagePathExtension;
 
 class ImagePathExtensionTest extends \PHPUnit_Framework_TestCase
@@ -103,7 +102,7 @@ public function testGetImagePathExceptionPreset()
     }
 
     /**
-     *Tests get image path part.
+     * Tests get image path part.
      *
      * @covers \ONGR\SettingsBundle\Twig\ImagePathExtension::getImagePath()
      *
diff --git a/Twig/WrapperExtension.php b/Twig/WrapperExtension.php
index 6490a75..035e18e 100644
--- a/Twig/WrapperExtension.php
+++ b/Twig/WrapperExtension.php
@@ -87,7 +87,7 @@ public function wrap($text, $keywords, $prefix = '<strong>', $suffix = '</strong
     /**
      * Returns the name of the extension.
      *
-     * @return string The extension name
+     * @return string The extension name.
      */
     public function getName()
     {
diff --git a/composer.json b/composer.json
index ed1f1b3..13db64f 100644
--- a/composer.json
+++ b/composer.json
@@ -25,8 +25,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "~4.2",
-        "squizlabs/php_codesniffer": "~1.5",
-        "ongr/ongr-strict-standard": "~1.0"
+        "squizlabs/php_codesniffer": "~2.0",
+        "ongr/ongr-strict-standard": "~2.1"
     },
     "autoload": {
         "psr-4": { "ONGR\\SettingsBundle\\": "" }