diff --git a/community/bolt/pom.xml b/community/bolt/pom.xml
index 0f11de03be68..35c9ffc2817b 100644
--- a/community/bolt/pom.xml
+++ b/community/bolt/pom.xml
@@ -110,5 +110,11 @@
       <artifactId>websocket-client</artifactId>
       <scope>test</scope>
     </dependency>
+      <dependency>
+          <groupId>commons-lang</groupId>
+          <artifactId>commons-lang</artifactId>
+          <version>RELEASE</version>
+          <scope>test</scope>
+      </dependency>
   </dependencies>
 </project>
diff --git a/community/server/src/test/java/org/neo4j/server/security/ssl/CertificatesIT.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/SelfSignedCertificatesIT.java
similarity index 94%
rename from community/server/src/test/java/org/neo4j/server/security/ssl/CertificatesIT.java
rename to community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/SelfSignedCertificatesIT.java
index 9e824bd0a0ec..e31b96b5041f 100644
--- a/community/server/src/test/java/org/neo4j/server/security/ssl/CertificatesIT.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/SelfSignedCertificatesIT.java
@@ -17,31 +17,30 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.server.security.ssl;
+package org.neo4j.bolt.v1.transport.integration;
 
 import org.apache.commons.lang.SystemUtils;
 import org.junit.Rule;
 import org.junit.Test;
 
-import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.attribute.PosixFileAttributeView;
 import java.nio.file.attribute.PosixFileAttributes;
 import java.nio.file.attribute.PosixFilePermission;
 
+import org.neo4j.bolt.security.ssl.Certificates;
 import org.neo4j.test.TargetDirectory;
 
 import static org.junit.Assert.*;
 import static org.junit.Assume.assumeTrue;
-import static org.neo4j.test.TargetDirectory.testDirForTest;
 
-public class CertificatesIT
+public class SelfSignedCertificatesIT
 {
     @Rule
     public TargetDirectory.TestDirectory testDirectory = TargetDirectory.testDirForTest( getClass() );
 
     @Test
-    public void createSelfSignedCertificate() throws Exception
+    public void createSelfSignedCertificateWithCorrectPermissions() throws Exception
     {
         assumeTrue( !SystemUtils.IS_OS_WINDOWS );