diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 619d9706a7a..0f71eb3983d 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -19,7 +19,7 @@
 
     <groups>
         <exclude>
-            <group>functional</group>
+            <group>integration</group>
         </exclude>
     </groups>
 
diff --git a/test/Github/Tests/Functional/CommitTest.php b/test/Github/Tests/Integration/CommitTest.php
similarity index 97%
rename from test/Github/Tests/Functional/CommitTest.php
rename to test/Github/Tests/Integration/CommitTest.php
index 4aec0b3cc60..8dcaa0d022e 100644
--- a/test/Github/Tests/Functional/CommitTest.php
+++ b/test/Github/Tests/Integration/CommitTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Github\Tests\Functional;
+namespace Github\Tests\Integration;
 
 /**
- * @group functional
+ * @group integration
  */
 class CommitTest extends TestCase
 {
diff --git a/test/Github/Tests/Functional/GistTest.php b/test/Github/Tests/Integration/GistTest.php
similarity index 97%
rename from test/Github/Tests/Functional/GistTest.php
rename to test/Github/Tests/Integration/GistTest.php
index f4464facc66..e8ce7bc2543 100644
--- a/test/Github/Tests/Functional/GistTest.php
+++ b/test/Github/Tests/Integration/GistTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Github\Tests\Functional;
+namespace Github\Tests\Integration;
 
 /**
- * @group functional
+ * @group integration
  */
 class GistTest extends TestCase
 {
diff --git a/test/Github/Tests/Functional/IssueCommentTest.php b/test/Github/Tests/Integration/IssueCommentTest.php
similarity index 98%
rename from test/Github/Tests/Functional/IssueCommentTest.php
rename to test/Github/Tests/Integration/IssueCommentTest.php
index 2a9220763e3..d035182151a 100644
--- a/test/Github/Tests/Functional/IssueCommentTest.php
+++ b/test/Github/Tests/Integration/IssueCommentTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Github\Tests\Functional;
+namespace Github\Tests\Integration;
 
 /**
- * @group functional
+ * @group integration
  */
 class IssueCommentTest extends TestCase
 {
diff --git a/test/Github/Tests/Functional/MarkdownTest.php b/test/Github/Tests/Integration/MarkdownTest.php
similarity index 94%
rename from test/Github/Tests/Functional/MarkdownTest.php
rename to test/Github/Tests/Integration/MarkdownTest.php
index 34c967cbbef..fa4f413a3da 100644
--- a/test/Github/Tests/Functional/MarkdownTest.php
+++ b/test/Github/Tests/Integration/MarkdownTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Github\Tests\Functional;
+namespace Github\Tests\Integration;
 
 use Github\Api\Markdown;
 
 /**
- * @group functional
+ * @group integration
  */
 class MarkdownTest extends TestCase
 {
diff --git a/test/Github/Tests/Functional/RateLimitTest.php b/test/Github/Tests/Integration/RateLimitTest.php
similarity index 86%
rename from test/Github/Tests/Functional/RateLimitTest.php
rename to test/Github/Tests/Integration/RateLimitTest.php
index b0b63704d63..d0f0015f2c0 100644
--- a/test/Github/Tests/Functional/RateLimitTest.php
+++ b/test/Github/Tests/Integration/RateLimitTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Github\Tests\Functional;
+namespace Github\Tests\Integration;
 
 /**
- * @group functional
+ * @group integration
  */
 class RateLimitTest extends TestCase
 {
diff --git a/test/Github/Tests/Functional/RepoCommentTest.php b/test/Github/Tests/Integration/RepoCommentTest.php
similarity index 98%
rename from test/Github/Tests/Functional/RepoCommentTest.php
rename to test/Github/Tests/Integration/RepoCommentTest.php
index 3897f8214d5..a6447e8a0df 100644
--- a/test/Github/Tests/Functional/RepoCommentTest.php
+++ b/test/Github/Tests/Integration/RepoCommentTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Github\Tests\Functional;
+namespace Github\Tests\Integration;
 
 /**
- * @group functional
+ * @group integration
  */
 class RepoCommentTest extends TestCase
 {
diff --git a/test/Github/Tests/Functional/RepoTest.php b/test/Github/Tests/Integration/RepoTest.php
similarity index 98%
rename from test/Github/Tests/Functional/RepoTest.php
rename to test/Github/Tests/Integration/RepoTest.php
index 3d6946f9ffe..050c5575ab9 100644
--- a/test/Github/Tests/Functional/RepoTest.php
+++ b/test/Github/Tests/Integration/RepoTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Github\Tests\Functional;
+namespace Github\Tests\Integration;
 
 /**
- * @group functional
+ * @group integration
  */
 class RepoTest extends TestCase
 {
diff --git a/test/Github/Tests/Functional/ResultPagerTest.php b/test/Github/Tests/Integration/ResultPagerTest.php
similarity index 95%
rename from test/Github/Tests/Functional/ResultPagerTest.php
rename to test/Github/Tests/Integration/ResultPagerTest.php
index 9c4abc7b699..d533d2ac952 100644
--- a/test/Github/Tests/Functional/ResultPagerTest.php
+++ b/test/Github/Tests/Integration/ResultPagerTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Github\Tests\Functional;
+namespace Github\Tests\Integration;
 
 use Github\ResultPager;
 
 /**
- * @group functional
+ * @group integration
  */
 class ResultPagerTest extends TestCase
 {
diff --git a/test/Github/Tests/Functional/TestCase.php b/test/Github/Tests/Integration/TestCase.php
similarity index 93%
rename from test/Github/Tests/Functional/TestCase.php
rename to test/Github/Tests/Integration/TestCase.php
index 17c76cdc15e..13e88e37462 100644
--- a/test/Github/Tests/Functional/TestCase.php
+++ b/test/Github/Tests/Integration/TestCase.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Github\Tests\Functional;
+namespace Github\Tests\Integration;
 
 use Github\Client;
 use Github\Exception\ApiLimitExceedException;
 use Github\Exception\RuntimeException;
 
 /**
- * @group functional
+ * @group integration
  */
 class TestCase extends \PHPUnit_Framework_TestCase
 {
diff --git a/test/Github/Tests/Functional/UserTest.php b/test/Github/Tests/Integration/UserTest.php
similarity index 98%
rename from test/Github/Tests/Functional/UserTest.php
rename to test/Github/Tests/Integration/UserTest.php
index 3366ab96d02..41a14ac424f 100644
--- a/test/Github/Tests/Functional/UserTest.php
+++ b/test/Github/Tests/Integration/UserTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Github\Tests\Functional;
+namespace Github\Tests\Integration;
 
 /**
- * @group functional
+ * @group integration
  */
 class UserTest extends TestCase
 {