diff --git a/pkg/remote/builtin/gitlab/gitlab_test.go b/pkg/remote/builtin/gitlab/gitlab_test.go
new file mode 100644
index 000000000..832507195
--- /dev/null
+++ b/pkg/remote/builtin/gitlab/gitlab_test.go
@@ -0,0 +1,149 @@
+package gitlab
+
+import (
+	"bytes"
+	"fmt"
+	"net/http"
+	"testing"
+
+	"github.com/drone/drone/Godeps/_workspace/src/github.com/franela/goblin"
+	"github.com/drone/drone/pkg/remote/builtin/gitlab/testdata"
+	"github.com/drone/drone/pkg/types"
+)
+
+func Test_Gitlab(t *testing.T) {
+	// setup a dummy github server
+	var server = testdata.NewServer()
+	defer server.Close()
+
+	var gitlab, err = NewDriver(server.URL + "?client_id=test&client_secret=test")
+	if err != nil {
+		panic(err)
+	}
+
+	var user = types.User{
+		Login: "test_user",
+		Token: "e3b0c44298fc1c149afbf4c8996fb",
+	}
+
+	var repo = types.Repo{
+		Name:  "diaspora-client",
+		Owner: "diaspora",
+	}
+
+	g := goblin.Goblin(t)
+	g.Describe("Gitlab Plugin", func() {
+		// Test repository method
+		g.Describe("Repo", func() {
+			g.It("Should return valid repo", func() {
+				_repo, err := gitlab.Repo(&user, "diaspora", "diaspora-client")
+
+				g.Assert(err == nil).IsTrue()
+				g.Assert(_repo.Name).Equal("diaspora-client")
+				g.Assert(_repo.Owner).Equal("diaspora")
+				g.Assert(_repo.Private).Equal(true)
+			})
+
+			g.It("Should return error, when repo not exist", func() {
+				_, err := gitlab.Repo(&user, "not-existed", "not-existed")
+
+				g.Assert(err != nil).IsTrue()
+			})
+		})
+
+		// Test permissions method
+		g.Describe("Perm", func() {
+			g.It("Should return repo permissions", func() {
+				perm, err := gitlab.Perm(&user, "diaspora", "diaspora-client")
+
+				fmt.Println(gitlab.(*Gitlab), err)
+				g.Assert(err == nil).IsTrue()
+				g.Assert(perm.Admin).Equal(true)
+				g.Assert(perm.Pull).Equal(true)
+				g.Assert(perm.Push).Equal(true)
+			})
+
+			g.It("Should return error, when repo is not exist", func() {
+				_, err := gitlab.Perm(&user, "not-existed", "not-existed")
+
+				g.Assert(err != nil).IsTrue()
+			})
+		})
+
+		// Test activate method
+		g.Describe("Activate", func() {
+			g.It("Should be success", func() {
+				err := gitlab.Activate(&user, &repo, &types.Keypair{}, "http://example.com/api/hook/test/test?access_token=token")
+
+				g.Assert(err == nil).IsTrue()
+			})
+
+			g.It("Should be failed, when token not given", func() {
+				err := gitlab.Activate(&user, &repo, &types.Keypair{}, "http://example.com/api/hook/test/test")
+
+				g.Assert(err != nil).IsTrue()
+			})
+		})
+
+		// Test deactivate method
+		g.Describe("Deactivate", func() {
+			g.It("Should be success", func() {
+				err := gitlab.Deactivate(&user, &repo, "http://example.com/api/hook/test/test?access_token=token")
+
+				g.Assert(err == nil).IsTrue()
+			})
+		})
+
+		// Test login method
+		g.Describe("Login", func() {
+			g.It("Should return user", func() {
+				user, err := gitlab.Login("valid_token", "")
+
+				g.Assert(err == nil).IsTrue()
+				g.Assert(user == nil).IsFalse()
+			})
+
+			g.It("Should return error, when token is invalid", func() {
+				_, err := gitlab.Login("invalid_token", "")
+
+				g.Assert(err != nil).IsTrue()
+			})
+		})
+
+		// Test hook method
+		g.Describe("Hook", func() {
+			g.It("Should parse push hoook", func() {
+				req, _ := http.NewRequest(
+					"POST",
+					"http://example.com/api/hook?owner=diaspora&name=diaspora-client",
+					bytes.NewReader(testdata.PushHook),
+				)
+
+				hook, err := gitlab.Hook(req)
+
+				g.Assert(err == nil).IsTrue()
+				g.Assert(hook.Repo.Owner).Equal("diaspora")
+				g.Assert(hook.Repo.Name).Equal("diaspora-client")
+
+				g.Assert(hook.PullRequest == nil).IsTrue()
+			})
+
+			g.It("Should parse merge request hook", func() {
+				req, _ := http.NewRequest(
+					"POST",
+					"http://example.com/api/hook?owner=diaspora&name=diaspora-client",
+					bytes.NewReader(testdata.MergeRequestHook),
+				)
+
+				hook, err := gitlab.Hook(req)
+
+				g.Assert(err == nil).IsTrue()
+				g.Assert(hook.Repo.Owner).Equal("diaspora")
+				g.Assert(hook.Repo.Name).Equal("diaspora-client")
+
+				g.Assert(hook.PullRequest.Number).Equal(1)
+				g.Assert(hook.PullRequest.Title).Equal("")
+			})
+		})
+	})
+}
diff --git a/pkg/remote/builtin/gitlab/testdata/hooks.go b/pkg/remote/builtin/gitlab/testdata/hooks.go
new file mode 100644
index 000000000..836d29831
--- /dev/null
+++ b/pkg/remote/builtin/gitlab/testdata/hooks.go
@@ -0,0 +1,102 @@
+package testdata
+
+var MergeRequestHook = []byte(`
+{
+  "object_kind": "merge_request",
+  "user": {
+    "name": "Administrator",
+    "username": "root",
+    "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
+  },
+  "object_attributes": {
+    "id": 99,
+    "target_branch": "master",
+    "source_branch": "ms-viewport",
+    "source_project_id": 14,
+    "author_id": 51,
+    "assignee_id": 6,
+    "title": "MS-Viewport",
+    "created_at": "2013-12-03T17:23:34Z",
+    "updated_at": "2013-12-03T17:23:34Z",
+    "st_commits": null,
+    "st_diffs": null,
+    "milestone_id": null,
+    "state": "opened",
+    "merge_status": "unchecked",
+    "target_project_id": 14,
+    "iid": 1,
+    "description": "",
+    "source": {
+      "name": "awesome_project",
+      "ssh_url": "ssh://git@example.com/awesome_space/awesome_project.git",
+      "http_url": "http://example.com/awesome_space/awesome_project.git",
+      "visibility_level": 20,
+      "namespace": "awesome_space"
+    },
+    "target": {
+      "name": "awesome_project",
+      "ssh_url": "ssh://git@example.com/awesome_space/awesome_project.git",
+      "http_url": "http://example.com/awesome_space/awesome_project.git",
+      "visibility_level": 20,
+      "namespace": "awesome_space"
+    },
+    "last_commit": {
+      "id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
+      "message": "fixed readme",
+      "timestamp": "2012-01-03T23:36:29+02:00",
+      "url": "http://example.com/awesome_space/awesome_project/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
+      "author": {
+        "name": "GitLab dev user",
+        "email": "gitlabdev@dv6700.(none)"
+      }
+    },
+    "url": "http://example.com/diaspora/merge_requests/1",
+    "action": "open"
+  }
+}
+`)
+
+var PushHook = []byte(`
+{
+  "object_kind": "push",
+  "before": "95790bf891e76fee5e1747ab589903a6a1f80f22",
+  "after": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
+  "ref": "refs/heads/master",
+  "user_id": 4,
+  "user_name": "John Smith",
+  "user_email": "john@example.com",
+  "project_id": 15,
+  "repository": {
+    "name": "Diaspora",
+    "url": "git@example.com:mike/diasporadiaspora.git",
+    "description": "",
+    "homepage": "http://example.com/mike/diaspora", 
+    "git_http_url":"http://example.com/mike/diaspora.git",
+    "git_ssh_url":"git@example.com:mike/diaspora.git",
+    "visibility_level":0
+  },
+  "commits": [
+    {
+      "id": "b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
+      "message": "Update Catalan translation to e38cb41.",
+      "timestamp": "2011-12-12T14:27:31+02:00",
+      "url": "http://example.com/mike/diaspora/commit/b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
+      "author": {
+        "name": "Jordi Mallach",
+        "email": "jordi@softcatala.org"
+      }
+    },
+    {
+      "id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
+      "message": "fixed readme",
+      "timestamp": "2012-01-03T23:36:29+02:00",
+      "url": "http://example.com/mike/diaspora/commit/da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
+      "author": {
+        "name": "GitLab dev user",
+        "email": "gitlabdev@dv6700.(none)"
+      }
+    }
+  ],
+  "total_commits_count": 4
+}
+`)
diff --git a/pkg/remote/builtin/gitlab/testdata/oauth.go b/pkg/remote/builtin/gitlab/testdata/oauth.go
new file mode 100644
index 000000000..95119d70a
--- /dev/null
+++ b/pkg/remote/builtin/gitlab/testdata/oauth.go
@@ -0,0 +1,3 @@
+package testdata
+
+var accessTokenPayload = []byte(`access_token=sekret&scope=api&token_type=bearer`)
diff --git a/pkg/remote/builtin/gitlab/testdata/projects.go b/pkg/remote/builtin/gitlab/testdata/projects.go
new file mode 100644
index 000000000..09bec7366
--- /dev/null
+++ b/pkg/remote/builtin/gitlab/testdata/projects.go
@@ -0,0 +1,173 @@
+package testdata
+
+// sample repository list
+var projectsPayload = []byte(`
+[
+	{
+		"id": 4,
+		"description": null,
+		"default_branch": "master",
+		"public": false,
+		"visibility_level": 0,
+		"ssh_url_to_repo": "git@example.com:diaspora/diaspora-client.git",
+		"http_url_to_repo": "http://example.com/diaspora/diaspora-client.git",
+		"web_url": "http://example.com/diaspora/diaspora-client",
+		"owner": {
+			"id": 3,
+			"name": "Diaspora",
+			"created_at": "2013-09-30T13: 46: 02Z"
+		},
+		"name": "Diaspora Client",
+		"name_with_namespace": "Diaspora / Diaspora Client",
+		"path": "diaspora-client",
+		"path_with_namespace": "diaspora/diaspora-client",
+		"issues_enabled": true,
+		"merge_requests_enabled": true,
+		"wiki_enabled": true,
+		"snippets_enabled": false,
+		"created_at": "2013-09-30T13: 46: 02Z",
+		"last_activity_at": "2013-09-30T13: 46: 02Z",
+		"namespace": {
+			"created_at": "2013-09-30T13: 46: 02Z",
+			"description": "",
+			"id": 3,
+			"name": "Diaspora",
+			"owner_id": 1,
+			"path": "diaspora",
+			"updated_at": "2013-09-30T13: 46: 02Z"
+		},
+		"archived": false
+	},
+	{
+		"id": 6,
+		"description": null,
+		"default_branch": "master",
+		"public": false,
+		"visibility_level": 0,
+		"ssh_url_to_repo": "git@example.com:brightbox/puppet.git",
+		"http_url_to_repo": "http://example.com/brightbox/puppet.git",
+		"web_url": "http://example.com/brightbox/puppet",
+		"owner": {
+			"id": 4,
+			"name": "Brightbox",
+			"created_at": "2013-09-30T13:46:02Z"
+		},
+		"name": "Puppet",
+		"name_with_namespace": "Brightbox / Puppet",
+		"path": "puppet",
+		"path_with_namespace": "brightbox/puppet",
+		"issues_enabled": true,
+		"merge_requests_enabled": true,
+		"wiki_enabled": true,
+		"snippets_enabled": false,
+		"created_at": "2013-09-30T13:46:02Z",
+		"last_activity_at": "2013-09-30T13:46:02Z",
+		"namespace": {
+			"created_at": "2013-09-30T13:46:02Z",
+			"description": "",
+			"id": 4,
+			"name": "Brightbox",
+			"owner_id": 1,
+			"path": "brightbox",
+			"updated_at": "2013-09-30T13:46:02Z"
+		},
+		"archived": false
+	}
+]
+`)
+
+var project4Paylod = []byte(`
+{
+	"id": 4,
+	"description": null,
+	"default_branch": "master",
+	"public": false,
+	"visibility_level": 0,
+	"ssh_url_to_repo": "git@example.com:diaspora/diaspora-client.git",
+	"http_url_to_repo": "http://example.com/diaspora/diaspora-client.git",
+	"web_url": "http://example.com/diaspora/diaspora-client",
+	"owner": {
+		"id": 3,
+		"name": "Diaspora",
+		"created_at": "2013-09-30T13: 46: 02Z"
+	},
+	"name": "Diaspora Client",
+	"name_with_namespace": "Diaspora / Diaspora Client",
+	"path": "diaspora-client",
+	"path_with_namespace": "diaspora/diaspora-client",
+	"issues_enabled": true,
+	"merge_requests_enabled": true,
+	"wiki_enabled": true,
+	"snippets_enabled": false,
+	"created_at": "2013-09-30T13: 46: 02Z",
+	"last_activity_at": "2013-09-30T13: 46: 02Z",
+	"namespace": {
+		"created_at": "2013-09-30T13: 46: 02Z",
+		"description": "",
+		"id": 3,
+		"name": "Diaspora",
+		"owner_id": 1,
+		"path": "diaspora",
+		"updated_at": "2013-09-30T13: 46: 02Z"
+	},
+	"archived": false,
+	"permissions": {
+		"project_access": {
+			"access_level": 10,
+			"notification_level": 3
+		},
+		"group_access": {
+			"access_level": 50,
+			"notification_level": 3
+		}
+	}
+}
+`)
+
+var project6Paylod = []byte(`
+{
+	"id": 6,
+	"description": null,
+	"default_branch": "master",
+	"public": false,
+	"visibility_level": 0,
+	"ssh_url_to_repo": "git@example.com:brightbox/puppet.git",
+	"http_url_to_repo": "http://example.com/brightbox/puppet.git",
+	"web_url": "http://example.com/brightbox/puppet",
+	"owner": {
+	"id": 4,
+		"name": "Brightbox",
+		"created_at": "2013-09-30T13:46:02Z"
+	},
+	"name": "Puppet",
+	"name_with_namespace": "Brightbox / Puppet",
+	"path": "puppet",
+	"path_with_namespace": "brightbox/puppet",
+	"issues_enabled": true,
+	"merge_requests_enabled": true,
+	"wiki_enabled": true,
+	"snippets_enabled": false,
+	"created_at": "2013-09-30T13:46:02Z",
+	"last_activity_at": "2013-09-30T13:46:02Z",
+	"namespace": {
+		"created_at": "2013-09-30T13:46:02Z",
+		"description": "",
+		"id": 4,
+		"name": "Brightbox",
+		"owner_id": 1,
+		"path": "brightbox",
+		"updated_at": "2013-09-30T13:46:02Z"
+	},
+	"archived": false,
+	"permissions": {
+		"project_access": {
+			"access_level": 10,
+			"notification_level": 3
+		},
+		"group_access": {
+			"access_level": 50,
+			"notification_level": 3
+		}
+	}
+}
+`)
diff --git a/pkg/remote/builtin/gitlab/testdata/testdata.go b/pkg/remote/builtin/gitlab/testdata/testdata.go
new file mode 100644
index 000000000..de36846e1
--- /dev/null
+++ b/pkg/remote/builtin/gitlab/testdata/testdata.go
@@ -0,0 +1,56 @@
+package testdata
+
+import (
+	"net/http"
+	"net/http/httptest"
+)
+
+// setup a mock server for testing purposes.
+func NewServer() *httptest.Server {
+	mux := http.NewServeMux()
+	server := httptest.NewServer(mux)
+
+	// handle requests and serve mock data
+	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		//println(r.URL.Path + "  " + r.Method)
+		// evaluate the path to serve a dummy data file
+		switch r.URL.Path {
+		case "/api/v3/projects":
+			w.Write(projectsPayload)
+			return
+		case "/api/v3/projects/diaspora/diaspora-client":
+			w.Write(project4Paylod)
+			return
+		case "/api/v3/projects/diaspora/diaspora-client/services/drone-ci":
+			switch r.Method {
+			case "PUT":
+				if r.FormValue("token") == "" {
+					w.WriteHeader(404)
+				} else {
+					w.WriteHeader(201)
+				}
+			case "DELETE":
+				w.WriteHeader(201)
+			}
+
+			return
+		case "/oauth/token":
+			w.Write(accessTokenPayload)
+			return
+		case "/api/v3/user":
+			if r.Header.Get("Authorization") == "Bearer valid_token" {
+				w.Write(currentUserPayload)
+			} else {
+				w.WriteHeader(401)
+			}
+			return
+		}
+
+		// else return a 404
+		http.NotFound(w, r)
+	})
+
+	// return the server to the client which
+	// will need to know the base URL path
+	return server
+}
diff --git a/pkg/remote/builtin/gitlab/testdata/users.go b/pkg/remote/builtin/gitlab/testdata/users.go
new file mode 100644
index 000000000..e7d563697
--- /dev/null
+++ b/pkg/remote/builtin/gitlab/testdata/users.go
@@ -0,0 +1,24 @@
+package testdata
+
+var currentUserPayload = []byte(`
+{
+  "id": 1,
+  "username": "john_smith",
+  "email": "john@example.com",
+  "name": "John Smith",
+  "private_token": "dd34asd13as",
+  "state": "active",
+  "created_at": "2012-05-23T08:00:58Z",
+  "bio": null,
+  "skype": "",
+  "linkedin": "",
+  "twitter": "",
+  "website_url": "",
+  "theme_id": 1,
+  "color_scheme_id": 2,
+  "is_admin": false,
+  "can_create_group": true,
+  "can_create_project": true,
+  "projects_limit": 100
+}
+`)