diff --git a/composer.json b/composer.json
index f420fdf..be970a4 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "chobie\\Tests\\": "tests"
+            "Tests\\chobie\\": "tests"
         }
     },
     "extra": {
diff --git a/src/Jira/Api.php b/src/Jira/Api.php
index b915d60..270f131 100644
--- a/src/Jira/Api.php
+++ b/src/Jira/Api.php
@@ -98,14 +98,17 @@ public function getEndpoint()
     }
 
     /**
-     * set end point url.
+     * Set Endpoint URL
      *
-     * @param $url
+     * @param string $url
      */
     public function setEndPoint($url)
     {
         $this->fields = array();
 
+        // Remove trailing slash in the url
+        $url = rtrim($url, '/');
+
         $this->endpoint = $url;
     }
 
diff --git a/tests/Jira/Api/Authentication/BasicTest.php b/tests/Jira/Api/Authentication/BasicTest.php
index 1b98f22..5f7610d 100644
--- a/tests/Jira/Api/Authentication/BasicTest.php
+++ b/tests/Jira/Api/Authentication/BasicTest.php
@@ -1,13 +1,17 @@
 <?php
 
-class Jira_Api_Authentication_BasicTest extends PHPUnit_Framework_TestCase
+namespace Tests\chobie\Jira;
+
+use chobie\Jira\Api\Authentication\Basic;
+
+class BasicTest extends \PHPUnit_Framework_TestCase
 {
     public function testBasicAuthentication()
     {
         $id = "abc";
         $pass = "def";
 
-        $basic = new \chobie\Jira\Api\Authentication\Basic($id, $pass);
+        $basic = new Basic($id, $pass);
         $this->assertEquals($id, $basic->getId());
         $this->assertEquals($pass, $basic->getPassword());
         $this->assertEquals(base64_encode(sprintf("%s:%s", $id, $pass)), $basic->getCredential());
diff --git a/tests/Jira/ApiTest.php b/tests/Jira/ApiTest.php
new file mode 100644
index 0000000..f26dce7
--- /dev/null
+++ b/tests/Jira/ApiTest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Tests\chobie\Jira;
+
+use chobie\Jira\Api;
+use chobie\Jira\Api\Authentication\Anonymous;
+
+/**
+ * Class ApiTest
+ *
+ * @package Tests\chobie\Jira
+ */
+class ApiTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Tests that any trailing slash in the endpoint url is removed before being stored in the object state
+     */
+    public function testSetEndpointTrailingSlash()
+    {
+        $api = new Api('https://test.test/', new Anonymous(), null);
+        $this->assertEquals('https://test.test', $api->getEndpoint());
+
+        // Make sure nothing is removed if there is no trailing slash
+        $url = 'https://urlwithouttrailing.slash';
+        $api->setEndPoint($url);
+        $this->assertEquals($url, $api->getEndpoint());
+    }
+}
diff --git a/tests/Jira/IssueTypeTest.php b/tests/Jira/IssueTypeTest.php
index be03d05..80764cf 100644
--- a/tests/Jira/IssueTypeTest.php
+++ b/tests/Jira/IssueTypeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace chobie\Tests\Jira;
+namespace Tests\chobie\Jira;
 
 use chobie\Jira\IssueType;