diff --git a/README.md b/README.md
index 6ef82493..aa04d470 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ More details about this project can be found on the [frequently asked questions]
 This library can be found on [Packagist](http://packagist.org/packages/predis/predis) for an easier
 management of projects dependencies using [Composer](http://packagist.org/about-composer) or on our
 [own PEAR channel](http://pear.nrk.io) for a more traditional installation using PEAR. Ultimately,
-compressed archives of each release are [available on GitHub](https://github.com/nrk/predis/releases).
+compressed archives of each release are [available on GitHub](https://github.com/predishq/predis/releases).
 
 
 ### Loading the library ###
@@ -453,7 +453,7 @@ the development server profile will be used. You can refer to [the tests README]
 for more detailed information about testing Predis.
 
 Predis uses Travis CI for continuous integration and the history for past and current builds can be
-found [on its project page](http://travis-ci.org/nrk/predis).
+found [on its project page](http://travis-ci.org/predishq/predis).
 
 
 ## Other ##
@@ -461,9 +461,9 @@ found [on its project page](http://travis-ci.org/nrk/predis).
 
 ### Project related links ###
 
-- [Source code](https://github.com/nrk/predis)
-- [Wiki](https://github.com/nrk/predis/wiki)
-- [Issue tracker](https://github.com/nrk/predis/issues)
+- [Source code](https://github.com/predishq/predis)
+- [Wiki](https://github.com/predishq/predis/wiki)
+- [Issue tracker](https://github.com/predishq/predis/issues)
 - [PEAR channel](http://pear.nrk.io)
 
 
@@ -476,15 +476,15 @@ found [on its project page](http://travis-ci.org/nrk/predis).
 
 The code for Predis is distributed under the terms of the MIT license (see [LICENSE](LICENSE)).
 
-[ico-license]: https://img.shields.io/github/license/nrk/predis.svg?style=flat-square
+[ico-license]: https://img.shields.io/github/license/predishq/predis.svg?style=flat-square
 [ico-version-stable]: https://img.shields.io/packagist/v/predis/predis.svg?style=flat-square
 [ico-version-dev]: https://img.shields.io/packagist/vpre/predis/predis.svg?style=flat-square
 [ico-downloads-monthly]: https://img.shields.io/packagist/dm/predis/predis.svg?style=flat-square
-[ico-travis]: https://img.shields.io/travis/nrk/predis.svg?style=flat-square
+[ico-travis]: https://img.shields.io/travis/predishq/predis.svg?style=flat-square
 [ico-hhvm]: https://img.shields.io/hhvm/predis/predis.svg?style=flat-square
 [ico-gitter]: https://img.shields.io/gitter/room/nrk/predis.svg?style=flat-square
 
 [link-packagist]: https://packagist.org/packages/predis/predis
-[link-travis]: https://travis-ci.org/nrk/predis
+[link-travis]: https://travis-ci.org/predishq/predis
 [link-downloads]: https://packagist.org/packages/predis/predis/stats
 [link-gitter]: https://gitter.im/nrk/predis
diff --git a/tests/Predis/Collection/Iterator/HashKeyTest.php b/tests/Predis/Collection/Iterator/HashKeyTest.php
index 705387ea..d2901749 100644
--- a/tests/Predis/Collection/Iterator/HashKeyTest.php
+++ b/tests/Predis/Collection/Iterator/HashKeyTest.php
@@ -57,8 +57,8 @@ class HashKeyTest extends PredisTestCase
     }
 
     /**
-     * @link https://github.com/nrk/predis/pull/330
-     * @link https://github.com/nrk/predis/issues/331
+     * @see https://github.com/predishq/predis/pull/330
+     * @see https://github.com/predishq/predis/issues/331
      * @group disconnected
      */
     public function testIterationWithIntegerFields()
diff --git a/tests/Predis/Collection/Iterator/SortedSetKeyTest.php b/tests/Predis/Collection/Iterator/SortedSetKeyTest.php
index ca3deaf2..aeadeb5f 100644
--- a/tests/Predis/Collection/Iterator/SortedSetKeyTest.php
+++ b/tests/Predis/Collection/Iterator/SortedSetKeyTest.php
@@ -57,7 +57,7 @@ class SortedSetKeyTest extends PredisTestCase
     }
 
     /**
-     * @link https://github.com/nrk/predis/issues/216
+     * @see https://github.com/predishq/predis/issues/216
      * @group disconnected
      */
     public function testIterationWithIntegerMembers()
diff --git a/tests/Predis/Command/StringIncrementByFloatTest.php b/tests/Predis/Command/StringIncrementByFloatTest.php
index 8416615d..4976d1fc 100644
--- a/tests/Predis/Command/StringIncrementByFloatTest.php
+++ b/tests/Predis/Command/StringIncrementByFloatTest.php
@@ -76,7 +76,7 @@ class StringIncrementByFloatTest extends PredisCommandTestCase
         $redis->set('foo', 2);
 
         // We use round() to avoid errors on some platforms, see the following
-        // issue https://github.com/nrk/predis/issues/220 for reference.
+        // issue https://github.com/predishq/predis/issues/220 for reference.
         $this->assertEquals(22.123, $redis->incrbyfloat('foo', 20.123));
         $this->assertEquals(10, round($redis->incrbyfloat('foo', -12.123), 5));
         $this->assertEquals(-100.01, round($redis->incrbyfloat('foo', -110.01), 5));