diff --git a/fixtures/myCA.pem b/fixtures/myCA.pem
new file mode 100644
index 00000000..0e0b0f3f
--- /dev/null
+++ b/fixtures/myCA.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICpDCCAYwCCQDhqyUix1k1QzANBgkqhkiG9w0BAQsFADAUMRIwEAYDVQQDDAls
+b2NhbGhvc3QwHhcNMTkwNDI0MTY1NjQyWhcNNDYwOTA5MTY1NjQyWjAUMRIwEAYD
+VQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDi
+FhO2FN40HAMK3t/s1dhjSvk2rlMmuXSi9EriVT0+J3Y6ymkV6pIBfhSLfyJ0kjfI
+OarfvVHJhcGehRMokCAztwnoXmIWlmbMEMMeH+ko3sxRKNkURJrx0ddNXw2r1c54
+JmU1ROBi2MT8tc6syC8LATvGPM9r7Jvqj3aUSaqo7j4w7278+YlrX8NDBhii02qH
+uh/mRrDpHsEb2bHKijOBzuHIPZ/V5R3Fl6RB8qgNErq6GndD4YX3F+WvV5jBIgi4
+2AU8z3SI/VXP6J5RxvB9bKYWxxyn2TX9aRMTdUqOYAPoyvJ9kwhbh431fYkBGm77
+/QA/PF9Los0Tu6BnRzPXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJLzXt1ccXtD
+CAWFAt8rK8Q4B51wyGWiTs7EYrzb9JiYGuYwoQkcwGNPwxO8smV4HKylPYb+kbqb
+lXDcXk0ghn+UIXL8hvuYjk/cFHTHcnpX+jMOGg4Jzd6K8aqwuxbdasrUWKaHvy57
+SFE7ZvBf+VLMoIbBL5Oz2xe/NbyET0lZJk7f0GHN13abtAFtfYUSQQi+6HygAnLQ
+BpUa57vjGqi19CzB1k8kVREzBpBjzzXcJGKyyIp70xSKvaIcZ5bmdDxLfMVzLVAw
+TvIcYGWdGZf7GzehhXG+XvPRa2BrpqKFOoep9FttZqng6Dd8yaXHWb+niWxuut0i
+9WX3vtWRSNw=
+-----END CERTIFICATE-----
diff --git a/test/mock-servers/mock-compression-server.js b/test/mock-servers/mock-compression-server.js
index 0cf5abb3..ef9fb976 100644
--- a/test/mock-servers/mock-compression-server.js
+++ b/test/mock-servers/mock-compression-server.js
@@ -94,8 +94,8 @@ const tcpServer = net.createServer((socket) => {
 
 
 const tlsOptions = {
-    key: fs.readFileSync('../../fixtures/server/client-ssl.localhost.key'),
-    cert: fs.readFileSync('../../fixtures/server/client-ssl.localhost.crt'),
+    key: fs.readFileSync('../../fixtures/server/pitaya.key'),
+    cert: fs.readFileSync('../../fixtures/server/pitaya.crt'),
     rejectUnauthorized: false,
 };
 
diff --git a/test/mock-servers/mock-destroy-socket-server.js b/test/mock-servers/mock-destroy-socket-server.js
index 41e4baa0..40270a56 100644
--- a/test/mock-servers/mock-destroy-socket-server.js
+++ b/test/mock-servers/mock-destroy-socket-server.js
@@ -62,8 +62,8 @@ const tcpServer = net.createServer((socket) => {
 
 
 const tlsOptions = {
-    key: fs.readFileSync('../../fixtures/server/client-ssl.localhost.key'),
-    cert: fs.readFileSync('../../fixtures/server/client-ssl.localhost.crt'),
+    key: fs.readFileSync('../../fixtures/server/pitaya.key'),
+    cert: fs.readFileSync('../../fixtures/server/pitaya.crt'),
     rejectUnauthorized: false,
 };
 
diff --git a/test/mock-servers/mock-disconnect-server.js b/test/mock-servers/mock-disconnect-server.js
index 697002b4..f6028722 100644
--- a/test/mock-servers/mock-disconnect-server.js
+++ b/test/mock-servers/mock-disconnect-server.js
@@ -70,8 +70,8 @@ const tcpServer = net.createServer((socket) => {
 });
 
 const tlsOptions = {
-    key: fs.readFileSync('../../fixtures/server/client-ssl.localhost.key'),
-    cert: fs.readFileSync('../../fixtures/server/client-ssl.localhost.crt'),
+    key: fs.readFileSync('../../fixtures/server/pitaya.key'),
+    cert: fs.readFileSync('../../fixtures/server/pitaya.crt'),
     rejectUnauthorized: false,
 };
 
diff --git a/test/mock-servers/mock-kick-server.js b/test/mock-servers/mock-kick-server.js
index 1967dc11..465af5fe 100644
--- a/test/mock-servers/mock-kick-server.js
+++ b/test/mock-servers/mock-kick-server.js
@@ -77,8 +77,8 @@ const tcpServer = net.createServer((socket) => {
 
 
 const tlsOptions = {
-    key: fs.readFileSync('../../fixtures/server/client-ssl.localhost.key'),
-    cert: fs.readFileSync('../../fixtures/server/client-ssl.localhost.crt'),
+    key: fs.readFileSync('../../fixtures/server/pitaya.key'),
+    cert: fs.readFileSync('../../fixtures/server/pitaya.crt'),
     rejectUnauthorized: false,
 };
 
diff --git a/test/mock-servers/mock-kill-client-server.js b/test/mock-servers/mock-kill-client-server.js
index 8c26bb73..538285d8 100644
--- a/test/mock-servers/mock-kill-client-server.js
+++ b/test/mock-servers/mock-kill-client-server.js
@@ -63,8 +63,8 @@ const tcpServer = net.createServer((socket) => {
 
 
 const tlsOptions = {
-    key: fs.readFileSync('../../fixtures/server/client-ssl.localhost.key'),
-    cert: fs.readFileSync('../../fixtures/server/client-ssl.localhost.crt'),
+    key: fs.readFileSync('../../fixtures/server/pitaya.key'),
+    cert: fs.readFileSync('../../fixtures/server/pitaya.crt'),
     rejectUnauthorized: false,
 };
 
diff --git a/test/mock-servers/mock-timeout-server.js b/test/mock-servers/mock-timeout-server.js
index e77adfe3..db790bc9 100644
--- a/test/mock-servers/mock-timeout-server.js
+++ b/test/mock-servers/mock-timeout-server.js
@@ -82,8 +82,8 @@ const tcpServer = net.createServer((socket) => {
 
 
 const tlsOptions = {
-    key: fs.readFileSync('../../fixtures/server/client-ssl.localhost.key'),
-    cert: fs.readFileSync('../../fixtures/server/client-ssl.localhost.crt'),
+    key: fs.readFileSync('../../fixtures/server/pitaya.key'),
+    cert: fs.readFileSync('../../fixtures/server/pitaya.crt'),
     rejectUnauthorized: false,
 };
 
diff --git a/test/test-tr_tls.c b/test/test-tr_tls.c
index 2caa2bf3..cfb10aa9 100644
--- a/test/test-tr_tls.c
+++ b/test/test-tr_tls.c
@@ -89,7 +89,7 @@ test_add_key_pinned_errors(const MunitParameter params[], void *state)
 {
     assert_int(pc_lib_add_pinned_public_key_from_certificate_file("fixtures/asoijdoaisjdisajd"), ==, PC_RC_NO_SUCH_FILE);
     assert_int(pc_lib_add_pinned_public_key_from_certificate_file("fixtures/corrupt-ca.crt"), ==, PC_RC_ERROR);
-    assert_int(pc_lib_add_pinned_public_key_from_certificate_file("fixtures/ca.crt"), ==, PC_RC_OK);
+    assert_int(pc_lib_add_pinned_public_key_from_certificate_file("fixtures/myCA.pem"), ==, PC_RC_OK);
     pc_lib_clear_pinned_public_keys();
     return MUNIT_OK;
 }
@@ -156,7 +156,7 @@ test_key_not_pinned(const MunitParameter params[], void *state)
 {
     flag_t flag = flag_make();
 
-    pc_lib_add_pinned_public_key_from_certificate_file("fixtures/client-ssl.localhost.crt");
+    pc_lib_add_pinned_public_key_from_certificate_file("fixtures/server/pitaya.crt");
     pc_lib_clear_pinned_public_keys();
     pc_lib_skip_key_pin_check(false);
 
diff --git a/test/test_common.h b/test/test_common.h
index 52596272..0dbdc0db 100644
--- a/test/test_common.h
+++ b/test/test_common.h
@@ -24,7 +24,7 @@
 #define ArrayCount(arr) (sizeof(arr)/sizeof((arr)[0]))
 
 #define LOCALHOST "127.0.0.1"
-#define PITAYA_SERVER_URL "a1d127034f31611e8858512b1bea90da-838011280.us-east-1.elb.amazonaws.com"
+#define PITAYA_SERVER_URL "libpitaya-tests.tfgco.com"
 
 #define REQ_ROUTE "connector.getsessiondata"
 #define REQ_MSG "{\"name\": \"test\"}"
@@ -39,9 +39,9 @@
 #define NOTI_EX ((void*)0x33)
 #define NOTI_TIMEOUT 30
 
-#define CRT "fixtures/ca.crt"
+#define CRT "fixtures/myCA.pem"
 #define INCORRECT_CRT "fixtures/ca_incorrect.crt"
-#define SERVER_CRT "fixtures/server/client-ssl.localhost.crt"
+#define SERVER_CRT "fixtures/server/pitaya.crt"
 
 typedef struct {
     int tcp_port;