diff --git a/src/DIRAC/Core/Security/test/certs/ca/index.txt b/src/DIRAC/Core/Security/test/certs/ca/index.txt
index 0989c52d661..e69de29bb2d 100644
--- a/src/DIRAC/Core/Security/test/certs/ca/index.txt
+++ b/src/DIRAC/Core/Security/test/certs/ca/index.txt
@@ -1,2 +0,0 @@
-V	371021091514Z		1001	unknown	/O=Dirac Computing/O=CERN/CN=MrUser
-V	371021091817Z		1002	unknown	/O=Dirac Computing/O=CERN/CN=VOBox
diff --git a/src/DIRAC/Core/Security/test/certs/ca/index.txt.attr.old b/src/DIRAC/Core/Security/test/certs/ca/index.txt.attr.old
deleted file mode 100644
index 8f7e63a3475..00000000000
--- a/src/DIRAC/Core/Security/test/certs/ca/index.txt.attr.old
+++ /dev/null
@@ -1 +0,0 @@
-unique_subject = yes
diff --git a/src/DIRAC/Core/Security/test/certs/ca/index.txt.old b/src/DIRAC/Core/Security/test/certs/ca/index.txt.old
deleted file mode 100644
index 73d4026d2bc..00000000000
--- a/src/DIRAC/Core/Security/test/certs/ca/index.txt.old
+++ /dev/null
@@ -1 +0,0 @@
-V	371021091514Z		1001	unknown	/O=Dirac Computing/O=CERN/CN=MrUser
diff --git a/src/DIRAC/Core/Security/test/certs/ca/newcerts/1000.pem b/src/DIRAC/Core/Security/test/certs/ca/newcerts/1000.pem
deleted file mode 100644
index e826e2753d1..00000000000
--- a/src/DIRAC/Core/Security/test/certs/ca/newcerts/1000.pem
+++ /dev/null
@@ -1,127 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4096 (0x1000)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: O=DIRAC Computing, CN=DIRAC Computing Signing Certification Authority
-        Validity
-            Not Before: Aug 22 09:14:03 2018 GMT
-            Not After : Sep  1 09:14:03 2019 GMT
-        Subject: O=Dirac Computing, O=CERN, CN=MrUser
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:a9:f6:67:7f:dc:0a:f9:af:aa:c7:c9:1f:46:52:
-                    1a:7a:1c:c3:da:2c:7e:e9:32:99:27:ec:3d:68:19:
-                    61:d7:56:f9:70:f7:e6:20:c3:a6:4c:45:de:f2:b0:
-                    f9:1b:a5:8a:a1:f3:8a:34:18:90:e2:f5:f6:b4:4b:
-                    fb:a6:c6:29:7a:d3:30:43:d4:79:92:ce:bb:44:df:
-                    d8:18:59:33:10:43:bb:8f:36:05:b5:6b:12:da:36:
-                    ec:74:75:5f:ff:6c:1e:8c:80:8f:84:00:58:3f:5b:
-                    06:69:06:d1:5a:d7:29:eb:dd:1f:67:de:dc:33:57:
-                    3b:02:e3:7f:7c:56:7d:9b:79:80:a2:8a:79:05:ce:
-                    a9:d6:1a:96:49:7c:99:71:ef:f4:27:ef:d2:8e:da:
-                    cb:79:66:3c:ca:f3:31:e3:3b:51:fb:cc:10:1b:e8:
-                    57:10:08:9f:9d:3e:fb:cf:0c:5e:1f:ba:4f:93:08:
-                    f7:20:5a:51:a3:38:a6:4e:66:8f:83:4c:29:c1:42:
-                    57:51:df:0b:a4:f9:c5:ea:90:5e:64:f3:32:6c:9e:
-                    1b:e1:37:e8:75:d0:97:48:5f:f0:4f:ba:bd:51:f4:
-                    ca:a6:d7:28:2d:ac:85:08:ba:7e:98:d2:48:2a:42:
-                    94:ce:6f:f5:08:13:05:92:17:a7:cd:23:fb:ba:18:
-                    e1:bb:74:b0:af:a4:97:97:3d:69:11:6e:c1:f4:51:
-                    72:ca:08:4b:77:b1:4c:12:e0:c8:02:ef:14:2e:a2:
-                    c0:01:31:51:f7:9a:79:79:cd:c6:6c:e6:d5:e0:e5:
-                    f8:1b:55:29:f5:fe:af:0e:57:be:aa:1c:24:43:cd:
-                    6e:5b:17:9b:b1:a5:56:bd:e5:28:df:c1:ec:97:7e:
-                    dd:ab:10:7d:23:13:4e:0b:f9:d3:42:ee:7c:97:72:
-                    a7:2e:87:4c:3b:07:82:98:39:f3:1c:5a:c2:e5:5f:
-                    7a:a5:8a:ca:39:a1:63:d8:88:e0:e9:33:b9:99:a4:
-                    07:a3:48:5f:c2:20:02:14:d2:2f:60:36:fc:03:13:
-                    66:0f:33:95:00:06:64:77:f6:34:9d:b6:1e:68:ee:
-                    bf:78:d2:73:46:2c:09:18:a6:4c:9d:70:b7:52:9c:
-                    d1:98:80:5e:9c:34:d5:30:28:c4:3b:56:63:b1:77:
-                    b4:87:08:d2:d3:fb:11:ca:d6:47:37:58:d6:ce:d9:
-                    cc:b9:87:ed:bb:70:4b:51:02:50:2f:47:26:91:6b:
-                    cf:1a:35:ca:05:df:64:1e:1b:98:8e:d6:6e:f9:21:
-                    32:2e:78:be:e9:55:c9:24:2c:91:ef:fd:a4:9a:59:
-                    2a:f5:48:a6:07:e4:4b:03:e1:1e:99:6e:c8:93:4a:
-                    03:23:8f
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints:
-                CA:FALSE
-            X509v3 Subject Key Identifier:
-                4A:C2:FD:EB:2C:C5:F1:63:A5:F2:17:62:43:6B:9D:82:6C:9A:13:24
-            X509v3 Authority Key Identifier:
-                keyid:04:C2:17:AF:38:64:E0:86:BF:1F:C9:00:6E:97:6F:1B:BB:4E:87:1F
-
-            X509v3 Key Usage: critical
-                Digital Signature, Non Repudiation, Key Encipherment
-            X509v3 Extended Key Usage:
-                TLS Web Client Authentication
-            Netscape Comment:
-                OpenSSL Generated Client Certificate
-    Signature Algorithm: sha256WithRSAEncryption
-         69:94:90:e8:07:e6:11:fd:a8:ce:df:0e:88:b0:e9:02:12:ff:
-         d5:b2:f7:31:21:6a:fb:69:b6:d1:d7:11:51:c2:6d:c7:c8:f0:
-         95:e6:55:73:65:6c:c1:45:c6:f6:72:37:55:6b:09:ed:a7:2b:
-         ce:87:a8:54:96:0c:b8:39:a4:7f:df:e8:23:0f:78:7b:93:3f:
-         6e:50:ae:bf:0b:72:16:86:b8:8b:20:e0:14:92:17:83:e3:6f:
-         ab:62:1b:9b:e2:8c:1d:36:4b:50:14:78:dd:bf:9b:d5:fb:7a:
-         b7:3f:73:ce:a8:21:9e:1a:5b:f7:20:41:08:37:7f:ce:36:ed:
-         83:43:75:c8:e4:91:a2:38:0e:1e:50:51:72:d3:21:31:1a:13:
-         f5:48:fc:e3:46:47:91:ea:5c:d0:77:6c:73:95:ed:7e:9b:68:
-         e5:30:45:9b:c9:b0:4d:25:3f:46:54:a5:2f:c3:24:d9:e7:88:
-         48:b2:b4:af:ac:1a:18:3f:c0:03:5c:50:f8:67:a6:bf:72:0c:
-         53:1c:2c:9f:da:42:49:b8:7d:76:44:7a:7b:a8:a6:72:67:0d:
-         b4:c7:ee:1e:82:c0:3b:67:30:91:64:28:3c:b7:5b:e9:f7:24:
-         4f:d8:e5:0a:a8:b7:cd:e3:69:e9:78:82:53:fd:f7:ec:65:a5:
-         54:9a:91:33:92:be:1a:4f:c9:34:10:5c:4e:97:57:0d:d7:d8:
-         4a:81:82:bc:eb:9e:d2:a1:9d:65:c5:6e:cc:50:b3:eb:82:5a:
-         fd:f3:a6:af:9d:d4:b2:a8:54:5a:91:75:01:38:f5:46:5a:a6:
-         bf:11:24:f6:03:29:f3:36:2f:05:56:e7:2a:e7:b1:f6:c2:24:
-         4e:ce:85:ad:95:d8:19:25:63:ba:b9:09:66:c9:9f:3b:02:34:
-         d6:d5:c8:b4:df:32:a0:85:74:0c:4a:28:31:b0:9b:ce:49:dc:
-         b9:d1:3f:fa:58:4b:2e:ca:a0:9c:3e:f6:36:e5:f9:f6:6d:31:
-         8c:cc:48:78:20:ea:78:33:a9:83:7b:4e:f7:68:b4:92:4e:9a:
-         78:81:c6:24:91:62:4a:e9:af:ff:30:3e:22:42:7c:05:49:d9:
-         49:15:6f:46:30:51:61:05:8f:19:7c:6e:65:6a:78:db:56:a2:
-         47:a6:2a:11:0c:ef:27:0c:7e:2b:ce:ff:0c:eb:9d:49:47:e9:
-         97:f6:b5:c8:c9:d7:9c:9c:6e:8a:f4:62:ee:0e:53:75:bf:ca:
-         3e:b3:2a:bc:1d:a7:64:f3:3a:bf:a2:6c:77:5e:28:68:7a:aa:
-         fd:b3:1d:37:79:b8:d6:17:02:d3:87:0e:25:7d:70:9b:9e:31:
-         45:42:dc:a6:2b:a3:09:7c
------BEGIN CERTIFICATE-----
-MIIFszCCA5ugAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwVDEYMBYGA1UECgwPRElS
-QUMgQ29tcHV0aW5nMTgwNgYDVQQDDC9ESVJBQyBDb21wdXRpbmcgU2lnbmluZyBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0xODA4MjIwOTE0MDNaFw0xOTA5MDEw
-OTE0MDNaMDoxGDAWBgNVBAoMD0RpcmFjIENvbXB1dGluZzENMAsGA1UECgwEQ0VS
-TjEPMA0GA1UEAwwGTXJVc2VyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
-AgEAqfZnf9wK+a+qx8kfRlIaehzD2ix+6TKZJ+w9aBlh11b5cPfmIMOmTEXe8rD5
-G6WKofOKNBiQ4vX2tEv7psYpetMwQ9R5ks67RN/YGFkzEEO7jzYFtWsS2jbsdHVf
-/2wejICPhABYP1sGaQbRWtcp690fZ97cM1c7AuN/fFZ9m3mAoop5Bc6p1hqWSXyZ
-ce/0J+/SjtrLeWY8yvMx4ztR+8wQG+hXEAifnT77zwxeH7pPkwj3IFpRozimTmaP
-g0wpwUJXUd8LpPnF6pBeZPMybJ4b4TfoddCXSF/wT7q9UfTKptcoLayFCLp+mNJI
-KkKUzm/1CBMFkhenzSP7uhjhu3Swr6SXlz1pEW7B9FFyyghLd7FMEuDIAu8ULqLA
-ATFR95p5ec3GbObV4OX4G1Up9f6vDle+qhwkQ81uWxebsaVWveUo38Hsl37dqxB9
-IxNOC/nTQu58l3KnLodMOweCmDnzHFrC5V96pYrKOaFj2Ijg6TO5maQHo0hfwiAC
-FNIvYDb8AxNmDzOVAAZkd/Y0nbYeaO6/eNJzRiwJGKZMnXC3UpzRmIBenDTVMCjE
-O1ZjsXe0hwjS0/sRytZHN1jWztnMuYftu3BLUQJQL0cmkWvPGjXKBd9kHhuYjtZu
-+SEyLni+6VXJJCyR7/2kmlkq9UimB+RLA+EemW7Ik0oDI48CAwEAAaOBqDCBpTAJ
-BgNVHRMEAjAAMB0GA1UdDgQWBBRKwv3rLMXxY6XyF2JDa52CbJoTJDAfBgNVHSME
-GDAWgBQEwhevOGTghr8fyQBul28bu06HHzAOBgNVHQ8BAf8EBAMCBeAwEwYDVR0l
-BAwwCgYIKwYBBQUHAwIwMwYJYIZIAYb4QgENBCYWJE9wZW5TU0wgR2VuZXJhdGVk
-IENsaWVudCBDZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQsFAAOCAgEAaZSQ6AfmEf2o
-zt8OiLDpAhL/1bL3MSFq+2m20dcRUcJtx8jwleZVc2VswUXG9nI3VWsJ7acrzoeo
-VJYMuDmkf9/oIw94e5M/blCuvwtyFoa4iyDgFJIXg+Nvq2Ibm+KMHTZLUBR43b+b
-1ft6tz9zzqghnhpb9yBBCDd/zjbtg0N1yOSRojgOHlBRctMhMRoT9Uj840ZHkepc
-0Hdsc5Xtfpto5TBFm8mwTSU/RlSlL8Mk2eeISLK0r6waGD/AA1xQ+Gemv3IMUxws
-n9pCSbh9dkR6e6imcmcNtMfuHoLAO2cwkWQoPLdb6fckT9jlCqi3zeNp6XiCU/33
-7GWlVJqRM5K+Gk/JNBBcTpdXDdfYSoGCvOue0qGdZcVuzFCz64Ja/fOmr53UsqhU
-WpF1ATj1RlqmvxEk9gMp8zYvBVbnKuex9sIkTs6FrZXYGSVjurkJZsmfOwI01tXI
-tN8yoIV0DEooMbCbzkncudE/+lhLLsqgnD72NuX59m0xjMxIeCDqeDOpg3tO92i0
-kk6aeIHGJJFiSumv/zA+IkJ8BUnZSRVvRjBRYQWPGXxuZWp421aiR6YqEQzvJwx+
-K87/DOudSUfpl/a1yMnXnJxuivRi7g5Tdb/KPrMqvB2nZPM6v6Jsd14oaHqq/bMd
-N3m41hcC04cOJX1wm54xRULcpiujCXw=
------END CERTIFICATE-----
diff --git a/src/DIRAC/Core/Security/test/certs/ca/newcerts/1001.pem b/src/DIRAC/Core/Security/test/certs/ca/newcerts/1001.pem
deleted file mode 100644
index 6dadd75c441..00000000000
--- a/src/DIRAC/Core/Security/test/certs/ca/newcerts/1001.pem
+++ /dev/null
@@ -1,127 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4097 (0x1001)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: O=DIRAC Computing, CN=DIRAC Computing Signing Certification Authority
-        Validity
-            Not Before: Aug 22 09:15:14 2018 GMT
-            Not After : Oct 21 09:15:14 2037 GMT
-        Subject: O=Dirac Computing, O=CERN, CN=MrUser
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:a9:f6:67:7f:dc:0a:f9:af:aa:c7:c9:1f:46:52:
-                    1a:7a:1c:c3:da:2c:7e:e9:32:99:27:ec:3d:68:19:
-                    61:d7:56:f9:70:f7:e6:20:c3:a6:4c:45:de:f2:b0:
-                    f9:1b:a5:8a:a1:f3:8a:34:18:90:e2:f5:f6:b4:4b:
-                    fb:a6:c6:29:7a:d3:30:43:d4:79:92:ce:bb:44:df:
-                    d8:18:59:33:10:43:bb:8f:36:05:b5:6b:12:da:36:
-                    ec:74:75:5f:ff:6c:1e:8c:80:8f:84:00:58:3f:5b:
-                    06:69:06:d1:5a:d7:29:eb:dd:1f:67:de:dc:33:57:
-                    3b:02:e3:7f:7c:56:7d:9b:79:80:a2:8a:79:05:ce:
-                    a9:d6:1a:96:49:7c:99:71:ef:f4:27:ef:d2:8e:da:
-                    cb:79:66:3c:ca:f3:31:e3:3b:51:fb:cc:10:1b:e8:
-                    57:10:08:9f:9d:3e:fb:cf:0c:5e:1f:ba:4f:93:08:
-                    f7:20:5a:51:a3:38:a6:4e:66:8f:83:4c:29:c1:42:
-                    57:51:df:0b:a4:f9:c5:ea:90:5e:64:f3:32:6c:9e:
-                    1b:e1:37:e8:75:d0:97:48:5f:f0:4f:ba:bd:51:f4:
-                    ca:a6:d7:28:2d:ac:85:08:ba:7e:98:d2:48:2a:42:
-                    94:ce:6f:f5:08:13:05:92:17:a7:cd:23:fb:ba:18:
-                    e1:bb:74:b0:af:a4:97:97:3d:69:11:6e:c1:f4:51:
-                    72:ca:08:4b:77:b1:4c:12:e0:c8:02:ef:14:2e:a2:
-                    c0:01:31:51:f7:9a:79:79:cd:c6:6c:e6:d5:e0:e5:
-                    f8:1b:55:29:f5:fe:af:0e:57:be:aa:1c:24:43:cd:
-                    6e:5b:17:9b:b1:a5:56:bd:e5:28:df:c1:ec:97:7e:
-                    dd:ab:10:7d:23:13:4e:0b:f9:d3:42:ee:7c:97:72:
-                    a7:2e:87:4c:3b:07:82:98:39:f3:1c:5a:c2:e5:5f:
-                    7a:a5:8a:ca:39:a1:63:d8:88:e0:e9:33:b9:99:a4:
-                    07:a3:48:5f:c2:20:02:14:d2:2f:60:36:fc:03:13:
-                    66:0f:33:95:00:06:64:77:f6:34:9d:b6:1e:68:ee:
-                    bf:78:d2:73:46:2c:09:18:a6:4c:9d:70:b7:52:9c:
-                    d1:98:80:5e:9c:34:d5:30:28:c4:3b:56:63:b1:77:
-                    b4:87:08:d2:d3:fb:11:ca:d6:47:37:58:d6:ce:d9:
-                    cc:b9:87:ed:bb:70:4b:51:02:50:2f:47:26:91:6b:
-                    cf:1a:35:ca:05:df:64:1e:1b:98:8e:d6:6e:f9:21:
-                    32:2e:78:be:e9:55:c9:24:2c:91:ef:fd:a4:9a:59:
-                    2a:f5:48:a6:07:e4:4b:03:e1:1e:99:6e:c8:93:4a:
-                    03:23:8f
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints:
-                CA:FALSE
-            X509v3 Subject Key Identifier:
-                4A:C2:FD:EB:2C:C5:F1:63:A5:F2:17:62:43:6B:9D:82:6C:9A:13:24
-            X509v3 Authority Key Identifier:
-                keyid:04:C2:17:AF:38:64:E0:86:BF:1F:C9:00:6E:97:6F:1B:BB:4E:87:1F
-
-            X509v3 Key Usage: critical
-                Digital Signature, Non Repudiation, Key Encipherment
-            X509v3 Extended Key Usage:
-                TLS Web Client Authentication
-            Netscape Comment:
-                OpenSSL Generated Client Certificate
-    Signature Algorithm: sha256WithRSAEncryption
-         39:ed:ae:11:4d:7b:51:63:94:88:3b:19:58:b0:d5:60:2f:36:
-         d2:c5:dc:0b:5f:62:8d:ca:3d:cc:d0:d5:7c:29:0a:cc:f3:0a:
-         28:f9:44:03:9e:9d:63:f2:ad:d1:c5:80:b6:29:25:3c:e8:96:
-         12:d2:b2:6e:c3:3b:6b:26:76:14:48:8f:74:14:9d:f4:ff:2a:
-         1d:81:4c:95:bb:17:73:28:9b:e5:05:e9:74:77:9b:72:2a:6e:
-         f4:e4:73:a7:e8:65:16:f4:c0:d5:f1:44:ac:39:fe:9c:f5:be:
-         c5:30:a9:d7:db:5d:96:b3:72:c3:10:d6:5d:b0:78:28:96:7f:
-         57:14:95:b9:3e:25:31:96:27:eb:05:0e:30:53:7f:c6:3e:35:
-         7a:f1:aa:a9:07:c9:9b:ec:93:7d:e5:b7:9f:60:a5:0c:20:db:
-         93:76:eb:ff:72:98:f1:e0:8f:2d:49:65:65:f7:49:82:73:76:
-         e1:25:ab:4b:84:b4:b4:1b:8e:66:df:a1:4e:de:cb:21:23:d2:
-         3c:88:b1:c5:73:6c:c4:b0:97:ab:b2:ac:12:52:25:cc:f3:db:
-         32:c7:6a:0c:9f:e5:84:35:28:1c:f6:59:bb:d7:21:8b:8b:7c:
-         17:92:46:93:37:27:d4:c3:92:9a:7e:5d:ef:89:31:49:80:f5:
-         41:38:2f:5f:be:ed:d0:0d:44:ec:6e:79:35:88:99:25:34:a3:
-         a1:a2:10:89:0c:01:34:46:a4:ec:ec:fd:40:28:7e:e6:a1:f0:
-         47:f3:69:e2:fa:38:f9:de:29:ca:e5:b1:a7:31:c7:06:e4:2b:
-         57:a7:43:67:49:8e:34:15:b1:ea:0c:69:90:53:78:da:6b:7c:
-         11:47:76:e9:f6:86:ee:47:9b:6d:e5:68:52:dd:55:05:37:29:
-         f4:71:c7:0c:a4:2a:f6:5a:28:76:01:a8:91:aa:f2:70:57:89:
-         f2:5f:99:30:cf:77:62:83:cf:56:5b:22:8c:6e:89:9a:7f:94:
-         ad:93:73:c1:b8:b9:25:c1:3b:df:5a:84:ba:b1:98:53:89:23:
-         a7:3a:62:ad:ab:b0:0a:73:a0:4a:6e:c3:c1:ac:0d:a2:29:4b:
-         14:e4:92:87:7f:e2:66:00:e3:33:28:6c:a4:62:76:17:05:c1:
-         94:99:bb:c0:15:b2:4b:ed:2a:4e:7b:1e:92:a4:da:9a:e4:c3:
-         4c:03:c9:46:16:f6:2c:f5:45:97:42:fc:f9:fa:e4:d6:09:29:
-         c3:82:93:0b:31:b0:e2:b2:96:fb:e1:14:8d:2d:62:d3:db:2a:
-         d8:3b:fa:fd:f5:bf:c9:ba:b1:a5:13:aa:9b:22:c7:6e:a1:04:
-         c6:3d:3f:84:fc:4f:28:fc
------BEGIN CERTIFICATE-----
-MIIFszCCA5ugAwIBAgICEAEwDQYJKoZIhvcNAQELBQAwVDEYMBYGA1UECgwPRElS
-QUMgQ29tcHV0aW5nMTgwNgYDVQQDDC9ESVJBQyBDb21wdXRpbmcgU2lnbmluZyBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0xODA4MjIwOTE1MTRaFw0zNzEwMjEw
-OTE1MTRaMDoxGDAWBgNVBAoMD0RpcmFjIENvbXB1dGluZzENMAsGA1UECgwEQ0VS
-TjEPMA0GA1UEAwwGTXJVc2VyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
-AgEAqfZnf9wK+a+qx8kfRlIaehzD2ix+6TKZJ+w9aBlh11b5cPfmIMOmTEXe8rD5
-G6WKofOKNBiQ4vX2tEv7psYpetMwQ9R5ks67RN/YGFkzEEO7jzYFtWsS2jbsdHVf
-/2wejICPhABYP1sGaQbRWtcp690fZ97cM1c7AuN/fFZ9m3mAoop5Bc6p1hqWSXyZ
-ce/0J+/SjtrLeWY8yvMx4ztR+8wQG+hXEAifnT77zwxeH7pPkwj3IFpRozimTmaP
-g0wpwUJXUd8LpPnF6pBeZPMybJ4b4TfoddCXSF/wT7q9UfTKptcoLayFCLp+mNJI
-KkKUzm/1CBMFkhenzSP7uhjhu3Swr6SXlz1pEW7B9FFyyghLd7FMEuDIAu8ULqLA
-ATFR95p5ec3GbObV4OX4G1Up9f6vDle+qhwkQ81uWxebsaVWveUo38Hsl37dqxB9
-IxNOC/nTQu58l3KnLodMOweCmDnzHFrC5V96pYrKOaFj2Ijg6TO5maQHo0hfwiAC
-FNIvYDb8AxNmDzOVAAZkd/Y0nbYeaO6/eNJzRiwJGKZMnXC3UpzRmIBenDTVMCjE
-O1ZjsXe0hwjS0/sRytZHN1jWztnMuYftu3BLUQJQL0cmkWvPGjXKBd9kHhuYjtZu
-+SEyLni+6VXJJCyR7/2kmlkq9UimB+RLA+EemW7Ik0oDI48CAwEAAaOBqDCBpTAJ
-BgNVHRMEAjAAMB0GA1UdDgQWBBRKwv3rLMXxY6XyF2JDa52CbJoTJDAfBgNVHSME
-GDAWgBQEwhevOGTghr8fyQBul28bu06HHzAOBgNVHQ8BAf8EBAMCBeAwEwYDVR0l
-BAwwCgYIKwYBBQUHAwIwMwYJYIZIAYb4QgENBCYWJE9wZW5TU0wgR2VuZXJhdGVk
-IENsaWVudCBDZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQsFAAOCAgEAOe2uEU17UWOU
-iDsZWLDVYC820sXcC19ijco9zNDVfCkKzPMKKPlEA56dY/Kt0cWAtiklPOiWEtKy
-bsM7ayZ2FEiPdBSd9P8qHYFMlbsXcyib5QXpdHebcipu9ORzp+hlFvTA1fFErDn+
-nPW+xTCp19tdlrNywxDWXbB4KJZ/VxSVuT4lMZYn6wUOMFN/xj41evGqqQfJm+yT
-feW3n2ClDCDbk3br/3KY8eCPLUllZfdJgnN24SWrS4S0tBuOZt+hTt7LISPSPIix
-xXNsxLCXq7KsElIlzPPbMsdqDJ/lhDUoHPZZu9chi4t8F5JGkzcn1MOSmn5d74kx
-SYD1QTgvX77t0A1E7G55NYiZJTSjoaIQiQwBNEak7Oz9QCh+5qHwR/Np4vo4+d4p
-yuWxpzHHBuQrV6dDZ0mONBWx6gxpkFN42mt8EUd26faG7kebbeVoUt1VBTcp9HHH
-DKQq9loodgGokarycFeJ8l+ZMM93YoPPVlsijG6Jmn+UrZNzwbi5JcE731qEurGY
-U4kjpzpirauwCnOgSm7DwawNoilLFOSSh3/iZgDjMyhspGJ2FwXBlJm7wBWyS+0q
-TnsekqTamuTDTAPJRhb2LPVFl0L8+frk1gkpw4KTCzGw4rKW++EUjS1i09sq2Dv6
-/fW/ybqxpROqmyLHbqEExj0/hPxPKPw=
------END CERTIFICATE-----
diff --git a/src/DIRAC/Core/Security/test/certs/ca/newcerts/1002.pem b/src/DIRAC/Core/Security/test/certs/ca/newcerts/1002.pem
deleted file mode 100644
index 3b641d744a8..00000000000
--- a/src/DIRAC/Core/Security/test/certs/ca/newcerts/1002.pem
+++ /dev/null
@@ -1,134 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4098 (0x1002)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: O=DIRAC Computing, CN=DIRAC Computing Signing Certification Authority
-        Validity
-            Not Before: Aug 22 09:18:17 2018 GMT
-            Not After : Oct 21 09:18:17 2037 GMT
-        Subject: O=Dirac Computing, O=CERN, CN=VOBox
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:e3:57:96:3a:01:02:3a:d6:76:47:cb:a8:63:af:
-                    53:33:88:51:5e:87:fc:f5:0d:d0:20:90:f7:e2:52:
-                    71:d0:2f:15:ad:bd:71:9c:73:8b:17:fe:d0:5c:0f:
-                    ab:6f:34:a4:f3:24:2c:32:15:50:0c:2f:45:8d:4c:
-                    3f:f0:e3:cd:13:52:61:88:2e:54:6d:83:ed:7b:a9:
-                    f4:96:7d:e0:af:0f:28:12:6c:63:48:35:7f:a5:6b:
-                    46:ae:12:a6:3b:bb:9a:17:b7:08:45:00:49:ea:05:
-                    ef:ba:a7:3b:e0:7d:3a:73:87:c7:8e:b4:14:ab:aa:
-                    02:54:c0:cb:5a:23:cd:4f:e8:b4:27:e6:ea:c8:41:
-                    b2:7b:86:0f:47:2a:1f:5d:01:7f:a6:47:f9:b0:c4:
-                    34:cf:a7:34:cf:e9:84:f9:a2:2a:97:13:98:51:68:
-                    f0:0e:ea:26:de:18:67:6e:ca:98:45:88:0c:15:cc:
-                    05:76:07:95:1f:07:8b:4b:f0:2f:d2:7b:23:d7:ef:
-                    ee:f4:5b:ea:5a:1c:3e:df:7c:96:87:2c:a1:50:8d:
-                    d0:3d:ab:b1:07:44:66:e6:d3:af:3e:68:f4:66:34:
-                    22:ad:97:5a:6d:81:b6:2a:b9:59:a9:d0:38:8e:e6:
-                    a3:92:ab:e2:d4:da:ff:16:e7:fc:bc:5b:be:43:6a:
-                    3c:aa:19:b2:6e:31:da:38:cc:c8:c2:bc:e6:9f:3a:
-                    f1:c7:69:b3:9f:62:b3:87:70:8e:8c:34:9c:76:67:
-                    ab:ff:1b:40:bb:98:c5:70:70:13:dc:b8:b9:2a:b6:
-                    26:b6:b8:f9:f3:c0:37:30:c5:52:f7:c0:af:ee:26:
-                    21:c7:c3:74:fa:a1:d9:8e:13:fe:8a:c5:83:3e:48:
-                    97:fd:c1:e0:5f:44:55:bf:7c:27:e4:59:87:c4:03:
-                    51:49:86:77:1f:0d:93:f3:c2:22:67:40:94:eb:46:
-                    5b:37:eb:ba:f0:9c:d2:c7:d1:59:2f:c4:32:ce:1d:
-                    8e:cb:86:5f:a3:d6:fc:1d:76:78:ce:35:8a:ca:54:
-                    cb:6d:7f:52:1f:14:de:50:74:c5:f6:ad:1a:e4:2d:
-                    7d:a3:65:75:da:27:82:01:79:50:56:58:f5:66:5a:
-                    3f:1e:f3:dd:9d:87:61:69:cd:95:7c:f1:71:3b:db:
-                    2d:7b:61:1c:7e:b9:7e:f1:ff:be:a9:dc:9f:47:de:
-                    f1:08:d0:b8:ff:e7:7a:b7:97:11:ff:5b:75:51:1a:
-                    76:da:73:bb:53:ee:4b:d5:a2:a7:94:69:77:38:01:
-                    08:88:17:6b:65:47:67:6d:8c:76:ce:00:0d:d2:97:
-                    b2:82:c4:90:6f:69:df:32:ab:b6:12:9b:62:39:f2:
-                    c4:0d:d7
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints:
-                CA:FALSE
-            Netscape Comment:
-                OpenSSL Generated Server Certificate
-            X509v3 Subject Key Identifier:
-                CB:42:51:C8:96:0A:29:92:78:B0:03:BC:B1:0A:9B:90:EB:C8:18:81
-            X509v3 Authority Key Identifier:
-                keyid:04:C2:17:AF:38:64:E0:86:BF:1F:C9:00:6E:97:6F:1B:BB:4E:87:1F
-                DirName:/O=DIRAC Computing/CN=DIRAC Computing Signing Certification Authority
-                serial:AC:BC:D0:B9:2B:47:C5:D8
-
-            X509v3 Key Usage: critical
-                Digital Signature, Key Encipherment
-            X509v3 Extended Key Usage:
-                TLS Web Server Authentication, TLS Web Client Authentication
-            X509v3 Subject Alternative Name:
-                DNS:VOBox, DNS:localhost
-    Signature Algorithm: sha256WithRSAEncryption
-         1d:fc:23:38:6c:79:28:d4:2c:cf:34:65:d8:86:e8:69:58:68:
-         e8:81:18:84:60:94:12:49:a8:37:ac:96:18:5e:8b:db:a9:82:
-         7d:f9:cb:3e:b8:46:a3:28:33:86:c5:59:26:9e:d2:01:42:30:
-         63:40:75:5e:43:21:75:19:89:37:d9:21:12:aa:37:7e:73:38:
-         46:6f:6c:05:3f:b7:91:e2:ef:4b:5e:77:70:cf:38:05:cc:e1:
-         76:a0:86:71:46:83:6e:99:4c:1f:3a:67:a0:e9:87:7d:d0:24:
-         ba:8d:92:a5:3c:a1:a3:9f:97:51:13:e1:30:e8:8a:6a:68:95:
-         02:34:33:cd:9d:6a:d3:e5:84:37:b6:12:4b:cf:8c:96:9c:94:
-         d5:ca:19:9d:24:5f:98:2a:b9:92:8a:a5:36:1e:f9:c8:ff:e0:
-         4e:c0:1b:d9:80:41:30:7d:33:a5:d7:a7:1e:62:fc:4f:8d:2e:
-         41:8b:8c:29:b4:e5:06:5d:6e:58:4b:98:9e:0c:8e:3d:a2:08:
-         63:0e:2f:fc:f6:fd:b8:67:70:96:15:c9:c7:80:00:51:bf:7d:
-         36:f6:62:4e:ae:5e:8f:f2:0d:a9:2a:dd:27:f2:ac:ea:52:cb:
-         9f:db:73:2e:58:55:c6:86:3a:56:a1:ef:8a:69:07:6e:a5:6c:
-         ef:dc:25:60:0e:71:39:ba:ce:ba:0b:cd:0b:5e:a2:b2:43:89:
-         ff:7a:12:c4:89:8f:97:f1:18:a0:e7:49:17:20:f8:af:b6:b0:
-         0d:dc:f8:6f:f7:f7:91:47:9f:5a:8a:45:19:5c:36:6f:f2:21:
-         6c:92:ae:45:23:b5:b4:a4:64:70:a1:49:4e:6f:7e:3c:25:22:
-         ae:5a:71:5f:d7:b6:45:c9:a5:8e:cb:e2:c7:10:d0:07:85:0c:
-         a7:48:85:b5:f1:f1:a8:d5:c0:1a:d4:fc:6c:f2:32:6c:3b:fa:
-         9d:0f:56:fc:cd:15:94:a7:d3:4e:83:eb:32:3a:0d:1c:14:70:
-         fa:7f:35:13:62:d6:8c:6b:9f:3b:f5:5d:56:7f:32:d8:96:14:
-         d6:60:cf:e9:a7:aa:96:a4:39:40:2c:08:6b:7d:62:21:25:54:
-         56:a7:99:2e:e2:32:4a:a1:a1:bb:79:e1:49:45:5e:17:dd:f8:
-         54:32:44:8d:a4:4a:b5:bc:90:bf:1e:22:cd:f7:75:98:09:65:
-         34:ff:29:2b:06:f1:ef:3c:dc:84:81:6f:9c:c3:78:de:3b:a7:
-         18:d4:e6:91:7f:ba:19:36:fd:e0:58:d4:4c:04:7a:fa:58:75:
-         03:e8:91:8d:11:1e:26:b5:c6:4a:41:28:e3:d1:63:40:6b:48:
-         60:9d:11:44:f9:fa:27:2d
------BEGIN CERTIFICATE-----
-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
-Hia1xkpBKOPRY0BrSGCdEUT5+ict
------END CERTIFICATE-----
diff --git a/src/DIRAC/Core/Security/test/certs/ca/serial b/src/DIRAC/Core/Security/test/certs/ca/serial
index baccd0398f9..e37d32abba4 100644
--- a/src/DIRAC/Core/Security/test/certs/ca/serial
+++ b/src/DIRAC/Core/Security/test/certs/ca/serial
@@ -1 +1 @@
-1003
+1000
\ No newline at end of file
diff --git a/src/DIRAC/Core/Security/test/certs/ca/serial.old b/src/DIRAC/Core/Security/test/certs/ca/serial.old
deleted file mode 100644
index 7d802a3e710..00000000000
--- a/src/DIRAC/Core/Security/test/certs/ca/serial.old
+++ /dev/null
@@ -1 +0,0 @@
-1002
diff --git a/src/DIRAC/RequestManagementSystem/DB/RequestDB.py b/src/DIRAC/RequestManagementSystem/DB/RequestDB.py
index 6c3cfdef04e..7715e4ba854 100644
--- a/src/DIRAC/RequestManagementSystem/DB/RequestDB.py
+++ b/src/DIRAC/RequestManagementSystem/DB/RequestDB.py
@@ -435,10 +435,13 @@ def getRequest(self, reqID=0, assigned=True):
             # FIXME: code for backward compatibility
             if not request.Owner:
                 # We go under the assumption that in this case OwnerDN exists
-                res = getDNForUsername(request.OwnerDN)
-                if not res["OK"]:
-                    return res
-                request.Owner = res["Value"][0]
+                if request.OwnerDN:
+                    res = getDNForUsername(request.OwnerDN)
+                    if not res["OK"]:
+                        return res
+                    request.Owner = res["Value"][0]
+                else:
+                    request.Owner = "Unknown"
             # ##
 
             return S_OK(request)
diff --git a/src/DIRAC/__init__.py b/src/DIRAC/__init__.py
index d24c7988da5..2820c8d76cf 100755
--- a/src/DIRAC/__init__.py
+++ b/src/DIRAC/__init__.py
@@ -227,6 +227,7 @@ def initialize(
 
     if host_credentials:
         gConfigurationData.setOptionInCFG("/DIRAC/Security/UseServerCertificate", "yes")
+    if isinstance(host_credentials, tuple):
         gConfigurationData.setOptionInCFG("/DIRAC/Security/CertFile", str(host_credentials[0]))
         gConfigurationData.setOptionInCFG("/DIRAC/Security/KeyFile", str(host_credentials[1]))
 
diff --git a/tests/Integration/AccountingSystem/Test_AccountingDB.py b/tests/Integration/AccountingSystem/Test_AccountingDB.py
index 7b480ef7b26..4fe60dbb7f5 100644
--- a/tests/Integration/AccountingSystem/Test_AccountingDB.py
+++ b/tests/Integration/AccountingSystem/Test_AccountingDB.py
@@ -4,7 +4,7 @@
 
 import DIRAC
 
-DIRAC.initialize()  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC import gLogger
 from DIRAC.AccountingSystem.DB.AccountingDB import AccountingDB
diff --git a/tests/Integration/ConfigurationSystem/Test_Helpers.py b/tests/Integration/ConfigurationSystem/Test_Helpers.py
index 8757866dacb..212783c3e8f 100644
--- a/tests/Integration/ConfigurationSystem/Test_Helpers.py
+++ b/tests/Integration/ConfigurationSystem/Test_Helpers.py
@@ -2,7 +2,7 @@
 """
 import DIRAC
 
-DIRAC.initialize()  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC.ConfigurationSystem.Client.Helpers import Resources
 
diff --git a/tests/Integration/DataManagementSystem/Test_Client_FTS3.py b/tests/Integration/DataManagementSystem/Test_Client_FTS3.py
index e14730c8d36..3a0c7cc6af5 100644
--- a/tests/Integration/DataManagementSystem/Test_Client_FTS3.py
+++ b/tests/Integration/DataManagementSystem/Test_Client_FTS3.py
@@ -7,7 +7,7 @@
 
 import DIRAC
 
-DIRAC.initialize()  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 import DIRAC.DataManagementSystem.DB.test.FTS3TestUtils as baseTestModule
 from DIRAC.DataManagementSystem.Client.FTS3Client import FTS3Client
diff --git a/tests/Integration/DataManagementSystem/Test_DataIntegrityDB.py b/tests/Integration/DataManagementSystem/Test_DataIntegrityDB.py
index fb699d5d280..bdd30a7cbf8 100644
--- a/tests/Integration/DataManagementSystem/Test_DataIntegrityDB.py
+++ b/tests/Integration/DataManagementSystem/Test_DataIntegrityDB.py
@@ -7,11 +7,10 @@
 # pylint: disable=invalid-name,wrong-import-position
 import time
 
-from DIRAC import gLogger
-
 import DIRAC
+from DIRAC import gLogger
 
-DIRAC.initialize()  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC.DataManagementSystem.DB.DataIntegrityDB import DataIntegrityDB
 
diff --git a/tests/Integration/DataManagementSystem/Test_FileCatalogDB.py b/tests/Integration/DataManagementSystem/Test_FileCatalogDB.py
index d7c17dc9070..becdb648d51 100644
--- a/tests/Integration/DataManagementSystem/Test_FileCatalogDB.py
+++ b/tests/Integration/DataManagementSystem/Test_FileCatalogDB.py
@@ -4,15 +4,15 @@
 """
 
 # pylint: disable=invalid-name,wrong-import-position
-import unittest
 import itertools
 import os
 import sys
+import unittest
 from collections import defaultdict
 
 import DIRAC
 
-DIRAC.initialize()  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC.DataManagementSystem.DB.FileCatalogDB import FileCatalogDB
 
diff --git a/tests/Integration/Framework/Test_AuthDB.py b/tests/Integration/Framework/Test_AuthDB.py
index 0fa3be79a40..db0ab0e6b7b 100644
--- a/tests/Integration/Framework/Test_AuthDB.py
+++ b/tests/Integration/Framework/Test_AuthDB.py
@@ -5,7 +5,7 @@
 
 import DIRAC
 
-DIRAC.initialize()  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from authlib.jose import JsonWebKey, JsonWebSignature, jwt, RSAKey
 from authlib.common.encoding import json_b64encode, urlsafe_b64decode, json_loads
diff --git a/tests/Integration/Framework/Test_AuthServer.py b/tests/Integration/Framework/Test_AuthServer.py
index 76fba565e8a..dc2e50ddefe 100644
--- a/tests/Integration/Framework/Test_AuthServer.py
+++ b/tests/Integration/Framework/Test_AuthServer.py
@@ -6,7 +6,7 @@
 
 import DIRAC
 
-DIRAC.initialize()  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC import S_OK
 from DIRAC.FrameworkSystem.private.authorization import AuthServer
diff --git a/tests/Integration/Framework/Test_InstalledComponentsDB.py b/tests/Integration/Framework/Test_InstalledComponentsDB.py
index 18d46093622..7685a17ba66 100644
--- a/tests/Integration/Framework/Test_InstalledComponentsDB.py
+++ b/tests/Integration/Framework/Test_InstalledComponentsDB.py
@@ -4,13 +4,13 @@
 This program assumes that the service Framework/ComponentMonitoring is running
 """
 # pylint: disable=invalid-name,wrong-import-position
-import unittest
-import sys
 import datetime
+import sys
+import unittest
 
 import DIRAC
 
-DIRAC.initialize()  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC.FrameworkSystem.Client.ComponentMonitoringClient import ComponentMonitoringClient
 
diff --git a/tests/Integration/Framework/Test_Proxy.sh b/tests/Integration/Framework/Test_Proxy.sh
index 51ef49c106b..317bca461ca 100644
--- a/tests/Integration/Framework/Test_Proxy.sh
+++ b/tests/Integration/Framework/Test_Proxy.sh
@@ -28,7 +28,7 @@ fi
 echo
 
 echo "====================="
-echo "===  dirac-login --status"
+echo "===  dirac-proxy-info"
 echo
 dirac-proxy-info
 if [[ "${?}" -ne 0 ]]; then
diff --git a/tests/Integration/Framework/Test_ProxyDB.py b/tests/Integration/Framework/Test_ProxyDB.py
index b5b6531fc35..c4c88e3bf9d 100644
--- a/tests/Integration/Framework/Test_ProxyDB.py
+++ b/tests/Integration/Framework/Test_ProxyDB.py
@@ -4,20 +4,20 @@
 # pylint: disable=invalid-name,wrong-import-position,protected-access
 import os
 import re
-import sys
-import stat
 import shutil
-import tempfile
+import stat
 
 # TODO: This should be modernised to use subprocess(32)
 import subprocess as commands
+import sys
+import tempfile
 import unittest
 
 from diraccfg import CFG
 
 import DIRAC
 
-DIRAC.initialize()  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 import DIRAC
 from DIRAC import gLogger, gConfig, S_OK, S_ERROR
diff --git a/tests/Integration/Framework/Test_TokenDB.py b/tests/Integration/Framework/Test_TokenDB.py
index dfff6851555..557cdd6df80 100644
--- a/tests/Integration/Framework/Test_TokenDB.py
+++ b/tests/Integration/Framework/Test_TokenDB.py
@@ -5,7 +5,7 @@
 
 import DIRAC
 
-DIRAC.initialize()  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 payload = {
     "sub": "user",
diff --git a/tests/Integration/Monitoring/Test_MonitoringDB.py b/tests/Integration/Monitoring/Test_MonitoringDB.py
index 437a769d202..0dad90981ba 100644
--- a/tests/Integration/Monitoring/Test_MonitoringDB.py
+++ b/tests/Integration/Monitoring/Test_MonitoringDB.py
@@ -1,15 +1,15 @@
 """ Test for MonitoringDB
 """
 
-import time
 import json
-import pytest
+import time
 
-from DIRAC.tests.Utilities.utils import find_all
+import pytest
 
 import DIRAC
+from DIRAC.tests.Utilities.utils import find_all
 
-DIRAC.initialize()  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC import gLogger
 from DIRAC.MonitoringSystem.DB.MonitoringDB import MonitoringDB
diff --git a/tests/Integration/Monitoring/Test_MonitoringReporter.py b/tests/Integration/Monitoring/Test_MonitoringReporter.py
index 2814791782c..5df4d48a3db 100644
--- a/tests/Integration/Monitoring/Test_MonitoringReporter.py
+++ b/tests/Integration/Monitoring/Test_MonitoringReporter.py
@@ -53,7 +53,7 @@
 # pylint: disable=invalid-name,wrong-import-position
 import DIRAC
 
-DIRAC.initialize()  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC import gLogger
 from DIRAC.MonitoringSystem.Client.MonitoringReporter import MonitoringReporter
diff --git a/tests/Integration/RequestManagementSystem/Test_ReqDB.py b/tests/Integration/RequestManagementSystem/Test_ReqDB.py
index 04b6f93e78b..d2987f6a84b 100644
--- a/tests/Integration/RequestManagementSystem/Test_ReqDB.py
+++ b/tests/Integration/RequestManagementSystem/Test_ReqDB.py
@@ -4,7 +4,7 @@
 # pylint: disable=invalid-name,wrong-import-position
 import DIRAC
 
-DIRAC.initialize()  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from pytest import fixture
 
diff --git a/tests/Integration/ResourceStatusSystem/Test_FullChain.py b/tests/Integration/ResourceStatusSystem/Test_FullChain.py
index dc762659b7d..ee75a165974 100644
--- a/tests/Integration/ResourceStatusSystem/Test_FullChain.py
+++ b/tests/Integration/ResourceStatusSystem/Test_FullChain.py
@@ -56,9 +56,10 @@
 
 
 import pytest
+
 import DIRAC
 
-DIRAC.initialize()  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC import gLogger
 from DIRAC.ResourceStatusSystem.PolicySystem.PDP import PDP
diff --git a/tests/Integration/TransformationSystem/Test_TS_CheckPerms.py b/tests/Integration/TransformationSystem/Test_TS_CheckPerms.py
index a481cd0665e..93e7efe8b6e 100644
--- a/tests/Integration/TransformationSystem/Test_TS_CheckPerms.py
+++ b/tests/Integration/TransformationSystem/Test_TS_CheckPerms.py
@@ -1,14 +1,14 @@
 #!/usr/bin/env python
 """ This tests the TransformationManager checkPermission function
 """
-import unittest
 import functools
 import sys
+import unittest
 
 import DIRAC
-from DIRAC import S_OK, S_ERROR
+from DIRAC import S_ERROR, S_OK
 
-DIRAC.initialize()  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC.TransformationSystem.Service.TransformationManagerHandler import TransformationManagerHandlerMixin
 
diff --git a/tests/Integration/WorkloadManagementSystem/Test_JobDB.py b/tests/Integration/WorkloadManagementSystem/Test_JobDB.py
index d525e933842..0987ebdc618 100644
--- a/tests/Integration/WorkloadManagementSystem/Test_JobDB.py
+++ b/tests/Integration/WorkloadManagementSystem/Test_JobDB.py
@@ -9,10 +9,11 @@
 from datetime import datetime, timedelta
 from unittest.mock import MagicMock, patch
 
-import DIRAC
 import pytest
 
-DIRAC.initialize()  # Initialize configuration
+import DIRAC
+
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC import S_OK, gLogger
 from DIRAC.WorkloadManagementSystem.Client import JobMinorStatus, JobStatus
diff --git a/tests/Integration/WorkloadManagementSystem/Test_JobLoggingDB.py b/tests/Integration/WorkloadManagementSystem/Test_JobLoggingDB.py
index 81d9fc73505..58b2bc41517 100755
--- a/tests/Integration/WorkloadManagementSystem/Test_JobLoggingDB.py
+++ b/tests/Integration/WorkloadManagementSystem/Test_JobLoggingDB.py
@@ -8,7 +8,7 @@
 
 import DIRAC
 
-DIRAC.initialize()  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC.WorkloadManagementSystem.DB.JobLoggingDB import JobLoggingDB
 
diff --git a/tests/Integration/WorkloadManagementSystem/Test_JobParametersDB.py b/tests/Integration/WorkloadManagementSystem/Test_JobParametersDB.py
index 68feee3f55f..2ac715fcabd 100644
--- a/tests/Integration/WorkloadManagementSystem/Test_JobParametersDB.py
+++ b/tests/Integration/WorkloadManagementSystem/Test_JobParametersDB.py
@@ -5,7 +5,7 @@
 
 import DIRAC
 
-DIRAC.initialize()  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC import gLogger
 from DIRAC.WorkloadManagementSystem.DB.JobParametersDB import JobParametersDB
diff --git a/tests/Integration/WorkloadManagementSystem/Test_PilotAgentsDB.py b/tests/Integration/WorkloadManagementSystem/Test_PilotAgentsDB.py
index 99c1cd1a71c..3243ae9ad54 100644
--- a/tests/Integration/WorkloadManagementSystem/Test_PilotAgentsDB.py
+++ b/tests/Integration/WorkloadManagementSystem/Test_PilotAgentsDB.py
@@ -9,7 +9,7 @@
 
 import DIRAC
 
-DIRAC.initialize()  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC import gLogger
 from DIRAC.WorkloadManagementSystem.DB.PilotAgentsDB import PilotAgentsDB, PivotedPilotSummaryTable
diff --git a/tests/Integration/WorkloadManagementSystem/Test_SandboxMetadataDB.py b/tests/Integration/WorkloadManagementSystem/Test_SandboxMetadataDB.py
index a37fdd18381..6da5c5303f7 100644
--- a/tests/Integration/WorkloadManagementSystem/Test_SandboxMetadataDB.py
+++ b/tests/Integration/WorkloadManagementSystem/Test_SandboxMetadataDB.py
@@ -2,7 +2,7 @@
 
 import DIRAC
 
-DIRAC.initialize()  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC import gLogger
 from DIRAC.WorkloadManagementSystem.DB.SandboxMetadataDB import SandboxMetadataDB
diff --git a/tests/Integration/WorkloadManagementSystem/Test_TaskQueueDB.py b/tests/Integration/WorkloadManagementSystem/Test_TaskQueueDB.py
index 5b89030f1cf..367bf64a1d7 100644
--- a/tests/Integration/WorkloadManagementSystem/Test_TaskQueueDB.py
+++ b/tests/Integration/WorkloadManagementSystem/Test_TaskQueueDB.py
@@ -10,11 +10,10 @@
     Suggestion: for local testing, run this with::
         python -m pytest -c ../pytest.ini  -vv tests/Integration/WorkloadManagementSystem/Test_TaskQueueDB.py
 """
-from DIRAC import gLogger
-
 import DIRAC
+from DIRAC import gLogger
 
-DIRAC.initialize()  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC.WorkloadManagementSystem.DB.TaskQueueDB import TaskQueueDB
 
diff --git a/tests/Integration/all_integration_client_tests.sh b/tests/Integration/all_integration_client_tests.sh
index 2c08595b88c..3e91394d818 100644
--- a/tests/Integration/all_integration_client_tests.sh
+++ b/tests/Integration/all_integration_client_tests.sh
@@ -20,6 +20,11 @@ pytest --no-check-dirac-environment "${THIS_DIR}/AccountingSystem/Test_DataStore
 pytest --no-check-dirac-environment "${THIS_DIR}/AccountingSystem/Test_ReportsClient.py" |& tee -a clientTestOutputs.txt; (( ERR |= "${?}" ))
 
 
+#-------------------------------------------------------------------------------#
+echo -e "*** $(date -u)  **** FTS TESTS ****\n"
+pytest --no-check-dirac-environment "${THIS_DIR}/DataManagementSystem/Test_Client_FTS3.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
+
+
 #-------------------------------------------------------------------------------#
 echo -e "*** $(date -u)  **** RMS TESTS ****\n"
 
diff --git a/tests/Integration/all_integration_server_tests.sh b/tests/Integration/all_integration_server_tests.sh
index 0f8a585a7d2..4b711f5d2a9 100644
--- a/tests/Integration/all_integration_server_tests.sh
+++ b/tests/Integration/all_integration_server_tests.sh
@@ -74,8 +74,8 @@ dirac-restart-component Tornado Tornado "${DEBUG}" |& tee -a "${SERVER_TEST_OUTP
 
 echo -e "*** $(date -u)  Run the DFC client tests as user without admin privileges" |& tee -a "${SERVER_TEST_OUTPUT}"
 echo -e "*** $(date -u)  Getting a non privileged user\n" |& tee -a "${SERVER_TEST_OUTPUT}"
-dirac-login -C "${WORKSPACE}/ServerInstallDIR/user/client.pem" -K "${WORKSPACE}/ServerInstallDIR/user/client.key" "${DEBUG}"
-python "${THIS_DIR}/DataManagementSystem/Test_Client_DFC.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
+# dirac-login -C "${WORKSPACE}/ServerInstallDIR/user/client.pem" -K "${WORKSPACE}/ServerInstallDIR/user/client.key" "${DEBUG}"
+# python "${THIS_DIR}/DataManagementSystem/Test_Client_DFC.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
 diracDFCDB |& tee -a "${SERVER_TEST_OUTPUT}"
 python "${THIS_DIR}/DataManagementSystem/Test_FileCatalogDB.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
 
@@ -86,21 +86,16 @@ echo -e "*** $(date -u)  Restart the DFC service (required for Test_Client_DFC)\
 if [[ "${TEST_HTTPS:-Yes}" = "No" ]]; then
   dirac-restart-component DataManagement FileCatalog "${DEBUG}" |& tee -a "${SERVER_TEST_OUTPUT}"
 fi
-dirac-restart-component Tornado Tornado "${DEBUG}" |& tee -a "${SERVER_TEST_OUTPUT}"
+# dirac-restart-component Tornado Tornado "${DEBUG}" |& tee -a "${SERVER_TEST_OUTPUT}"
 
 echo -e "*** $(date -u)  Run it with the admin privileges" |& tee -a "${SERVER_TEST_OUTPUT}"
 echo -e "*** $(date -u)  getting the prod role again\n" |& tee -a "${SERVER_TEST_OUTPUT}"
-dirac-login prod -C "${WORKSPACE}/ServerInstallDIR/user/client.pem" -K "${WORKSPACE}/ServerInstallDIR/user/client.key" "${DEBUG}" |& tee -a "${SERVER_TEST_OUTPUT}"
-python "${THIS_DIR}/DataManagementSystem/Test_Client_DFC.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
+# dirac-login prod -C "${WORKSPACE}/ServerInstallDIR/user/client.pem" -K "${WORKSPACE}/ServerInstallDIR/user/client.key" "${DEBUG}" |& tee -a "${SERVER_TEST_OUTPUT}"
+# python "${THIS_DIR}/DataManagementSystem/Test_Client_DFC.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
 diracDFCDB |& tee -a "${SERVER_TEST_OUTPUT}"
 python "${THIS_DIR}/DataManagementSystem/Test_FileCatalogDB.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
 
 
-#-------------------------------------------------------------------------------#
-echo -e "*** $(date -u)  **** FTS TESTS ****\n"
-# I know, it says Client, but it also instantiates a DB, so it needs to be here
-pytest --no-check-dirac-environment "${THIS_DIR}/DataManagementSystem/Test_Client_FTS3.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
-
 #-------------------------------------------------------------------------------#
 echo -e "*** $(date -u)  **** RMS TESTS ****\n"
 pytest --no-check-dirac-environment "${THIS_DIR}/RequestManagementSystem/Test_ReqDB.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
diff --git a/tests/Jenkins/dirac_ci.sh b/tests/Jenkins/dirac_ci.sh
index 00a0956ce93..906d9e152a4 100644
--- a/tests/Jenkins/dirac_ci.sh
+++ b/tests/Jenkins/dirac_ci.sh
@@ -126,7 +126,6 @@ installSite() {
   echo "source \"$PWD/diracos/diracosrc\"" > "$PWD/bashrc"
 
   mkdir -p "${SERVERINSTALLDIR}/diracos/etc/grid-security/certificates/"
-  mkdir -p "${SERVERINSTALLDIR}/user/"
 
   echo "==> CAs and certificates"
 
@@ -144,10 +143,6 @@ installSite() {
   # will be wrong on the client
   ln -s "${SERVERINSTALLDIR}/diracos/etc/grid-security/certificates/ca.cert.pem" "${SERVERINSTALLDIR}/diracos/etc/grid-security/certificates/$caHash.0"
 
-  # # Copy the user cert and key to the correct directory
-  # cp /ca/certs/client.pem "${SERVERINSTALLDIR}/user/"
-  # cp /ca/certs/client.key "${SERVERINSTALLDIR}/user/"
-
   rm -rf "${SERVERINSTALLDIR}/etc"
   ln -s "${SERVERINSTALLDIR}/diracos/etc" "${SERVERINSTALLDIR}/etc"
   source diracos/diracosrc
@@ -231,11 +226,6 @@ fullInstallDIRAC() {
     cat "${SERVERINSTALLDIR}/diracos/etc/Production.cfg"
   fi
 
-  # if ! diracCredentials; then
-  #   echo "ERROR: diracCredentials failed" >&2
-  #   exit 1
-  # fi
-
   #just add a site
   if ! diracAddSite; then
     echo "ERROR: diracAddSite failed" >&2
diff --git a/tests/Jenkins/utilities.sh b/tests/Jenkins/utilities.sh
index 34e3ef7aaa9..be8d69ae8e2 100644
--- a/tests/Jenkins/utilities.sh
+++ b/tests/Jenkins/utilities.sh
@@ -248,9 +248,6 @@ installDIRAC() {
   echo "export X509_CERT_DIR=\"$PWD/diracos/etc/grid-security/certificates\"" >> "$PWD/bashrc"
   source diracos/diracosrc
 
-  # Copy the user cert and key to the correct directory
-  # cp /ca/certs/client.pem "${SERVERINSTALLDIR}/user/"
-  # cp /ca/certs/client.key "${SERVERINSTALLDIR}/user/"
   cp /ca/certs/client.pem /home/dirac/.globus/usercert.pem
   cp /ca/certs/client.key /home/dirac/.globus/userkey.pem
 
@@ -390,8 +387,7 @@ diracCredentials() {
   echo '==> [diracCredentials]'
 
   sed -i 's/commitNewData = CSAdministrator/commitNewData = authenticated/g' "${SERVERINSTALLDIR}/etc/Configuration_Server.cfg"
-  if ! dirac-proxy-init dirac_admin --nocs -C "${SERVERINSTALLDIR}/user/client.pem" -K "${SERVERINSTALLDIR}/user/client.key" "${DEBUG}" --valid 72:00; then
-  # if ! dirac-login dirac_admin --nocs -C "${SERVERINSTALLDIR}/user/client.pem" -K "${SERVERINSTALLDIR}/user/client.key" "${DEBUG}" -T 72; then
+  if ! dirac-proxy-init dirac_admin --nocs "${DEBUG}" --valid 72:00; then
     echo 'ERROR: dirac-proxy-init failed' >&2
     exit 1
   fi
@@ -536,10 +532,6 @@ diracServices(){
 
   local services=$(cut -d '.' -f 1 < services | grep -v StorageElementHandler | grep -v ^ConfigurationSystem | grep -v RAWIntegrity | grep -v RunDBInterface | grep -v ComponentMonitoring | sed 's/System / /g' | sed 's/Handler//g' | sed 's/ /\//g')
 
-  # group proxy, will be uploaded explicitly
-  #  echo '==> getting/uploading proxy for prod'
-  #  dirac-proxy-init -U -g prod -C ${SERVERINSTALLDIR}/user/client.pem -K ${SERVERINSTALLDIR}/user/client.key "${DEBUG}"
-
   for serv in $services; do
     echo "==> calling dirac-install-component $serv -o /DIRAC/Security/UseServerCertificate=True ${DEBUG}"
     if ! dirac-install-component "$serv" -o /DIRAC/Security/UseServerCertificate=True "${DEBUG}"; then
@@ -591,10 +583,6 @@ diracUninstallServices(){
   # Ignore tornado services
   local services=$(cut -d '.' -f 1 < services | grep -v TokenManager | grep -v ^ConfigurationSystem | grep -v RAWIntegrity | grep -v RunDBInterface | grep -v ComponentMonitoring | grep -v Tornado | sed 's/System / /g' | sed 's/Handler//g' | sed 's/ /\//g')
 
-  # group proxy, will be uploaded explicitly
-  #  echo '==> getting/uploading proxy for prod'
-  #  dirac-proxy-init -U -g prod -C ${SERVERINSTALLDIR}/user/client.pem -K ${SERVERINSTALLDIR}/user/client.key "${DEBUG}"
-
   # check if errexit mode is set and disabling as the component may not exist
   local save=$-
   if [[ $save =~ e ]]; then