diff --git a/tests/ca-less/certificates/dirsrv/ipaserver/cert.p12 b/tests/ca-less/certificates/dirsrv/ipaserver/cert.p12
deleted file mode 100644
index 80d4173c0944d7aac1fece713d9a0f883466a421..0000000000000000000000000000000000000000
Binary files a/tests/ca-less/certificates/dirsrv/ipaserver/cert.p12 and /dev/null differ
diff --git a/tests/ca-less/certificates/dirsrv/ipaserver/cert.pem b/tests/ca-less/certificates/dirsrv/ipaserver/cert.pem
deleted file mode 100644
index 03673f260423b82304438cd8e8ae310ab2dff416..0000000000000000000000000000000000000000
--- a/tests/ca-less/certificates/dirsrv/ipaserver/cert.pem
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFJjCCAw4CFBqeymww9zijAoCXaghDC4CFRqWDMA0GCSqGSIb3DQEBCwUAMEAx
-CzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARUZXN0MRAwDgYDVQQHDAdUZXN0aW5nMRAw
-DgYDVQQKDAdEZWZhdWx0MB4XDTIwMDUyNjE0NDkwMVoXDTIxMDUyNjE0NDkwMVow
-XzELMAkGA1UEBhMCVVMxDTALBgNVBAgMBFRlc3QxEDAOBgNVBAcMB1Rlc3Rpbmcx
-EDAOBgNVBAoMB0RlZmF1bHQxHTAbBgNVBAMMFGlwYXNlcnZlci50ZXN0LmxvY2Fs
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxKOQCV4K6nCz3K01pDGw
-4/vwOH6tBg9kpSuVD5lvlp/e4Lo5WC2UXz0Sxs2DRabtB6wdi0/hz7j/oANxC7b3
-q5MOlHhyLrH75vwnlXslIDU+8t53cmZAQRC5v5sMhIbek3Gx/bc8Mbj+gAC2vdMC
-nQY0LmHbpqaKbPGn4rb+dYzk1nLsY/8RBDPUSfbKs8cqPYQe4JeYrpCGli2F/2rH
-cPMdqqa/io14/qaXDt1yDSDy9Cut5dRvIFqU6ZwitBJ9kOY5utw3WUuG+pAVP6tI
-luxbKGiq7wD8fktEAbFRe9XGCWLQvE5uWTyMumzgUIJjXXAB+1s9WvsA/oGuLcbL
-dqhyeC9ArZPuBE/N+QoEzmPpzKWROObwsEs2S77jf83FQ+ljVSKQDeBRIX9WsjCe
-GvmdIKwQooKjvNftJsS+KjsQMMXC1wrbM2XTweflNNLJtOE24AR/7aiGlcrdxLHK
-2f3LurvXy17oHKx3w/9sJz+KZYsc7iu3E9LYiUUU6Pleq1ZAkyS3e9ZxkUjN8I8m
-sbkcudOqOzdMiqB1szjtrdvd8ELgfjk9bMPruNe2IJV06RCmDzbV6w/MDHcbgXHx
-m6z3BF9oohSKnMi6q+m/88r7ccAYDwDNhx4ZuEXndRTUwuhdhWjsxLRzAK1e4A3K
-ovwhls+dYPz+p+k3eOHjLW8CAwEAATANBgkqhkiG9w0BAQsFAAOCAgEA4k0LXkEz
-gbIBDi6Vs6+Jx9DFqhfKtOvNNlwngPrrmJwTzOcajNoZ9A5Scf9TDD+sl3ApVSzI
-78YMWAXCe4HM92hC4PGwghpJpdqeChPsv8cJ1sRTKPn5cnlAnCLOjEoJcwMoZlle
-OIjJbckv8F5fqD3exy1PnQpWDPCPOPmBUJ37KjrXePqOyZRyY35BldjvV2fTh4Vh
-lecD5RCvTCmXagkTD9ZkHcCRXqdjGHou4l47KD0RIYCLbgZkH0Zy3YY5toKqUSsZ
-cv5Xv6dBRGAXJiYuwWlZhG4ZjE7lLowWc8Ev1CbN8UoLynNYNXR0hosdX3sx6I9h
-YFSPNt53yQpbz2gGo1IS7Ybd7LXY+ehQaAc/H/7sAQq97dxMYU/pjLV2p0jTOmEa
-jmTcpAOBMPq34EF2G8Rv1hMdcPpvHKVHPrSZRvYlUGSa8ocypcWAN+i65NgQFZkj
-Ozo1yQZULHLL2woJx2HFbonQA/YmppL0+trBYeYDNyIndqPZ4jVCQ3z+u1c3nNBe
-Hdu3c57m1xYgtOIBwy2vBkvUjjJ7KKObZunZOIyfJhyXzSwfAymv+GKB7BWcxhx+
-qTPArfIAf/Wc9sh8U3z1n7CqzNiiKd446ri6+i2W/Of53hMl5v98P0vueoitavl5
-o9hHKmOg0sgaPLFAVuQ87/VBUfnPSVv29Eo=
------END CERTIFICATE-----
diff --git a/tests/ca-less/certificates/dirsrv/ipaserver/private.key b/tests/ca-less/certificates/dirsrv/ipaserver/private.key
deleted file mode 100644
index f6d4eea321feef252cb3bb180282c124e6e9694f..0000000000000000000000000000000000000000
--- a/tests/ca-less/certificates/dirsrv/ipaserver/private.key
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN PRIVATE KEY-----
-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
-gacQljvqO1or61fDh23neyPdFrJL0QM=
------END PRIVATE KEY-----
diff --git a/tests/ca-less/certificates/dirsrv/ipaserver/request.csr b/tests/ca-less/certificates/dirsrv/ipaserver/request.csr
deleted file mode 100644
index 814bed862868de8bde5f0270a5d2aab44bac5ae9..0000000000000000000000000000000000000000
--- a/tests/ca-less/certificates/dirsrv/ipaserver/request.csr
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEpDCCAowCAQAwXzELMAkGA1UEBhMCVVMxDTALBgNVBAgMBFRlc3QxEDAOBgNV
-BAcMB1Rlc3RpbmcxEDAOBgNVBAoMB0RlZmF1bHQxHTAbBgNVBAMMFGlwYXNlcnZl
-ci50ZXN0LmxvY2FsMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxKOQ
-CV4K6nCz3K01pDGw4/vwOH6tBg9kpSuVD5lvlp/e4Lo5WC2UXz0Sxs2DRabtB6wd
-i0/hz7j/oANxC7b3q5MOlHhyLrH75vwnlXslIDU+8t53cmZAQRC5v5sMhIbek3Gx
-/bc8Mbj+gAC2vdMCnQY0LmHbpqaKbPGn4rb+dYzk1nLsY/8RBDPUSfbKs8cqPYQe
-4JeYrpCGli2F/2rHcPMdqqa/io14/qaXDt1yDSDy9Cut5dRvIFqU6ZwitBJ9kOY5
-utw3WUuG+pAVP6tIluxbKGiq7wD8fktEAbFRe9XGCWLQvE5uWTyMumzgUIJjXXAB
-+1s9WvsA/oGuLcbLdqhyeC9ArZPuBE/N+QoEzmPpzKWROObwsEs2S77jf83FQ+lj
-VSKQDeBRIX9WsjCeGvmdIKwQooKjvNftJsS+KjsQMMXC1wrbM2XTweflNNLJtOE2
-4AR/7aiGlcrdxLHK2f3LurvXy17oHKx3w/9sJz+KZYsc7iu3E9LYiUUU6Pleq1ZA
-kyS3e9ZxkUjN8I8msbkcudOqOzdMiqB1szjtrdvd8ELgfjk9bMPruNe2IJV06RCm
-DzbV6w/MDHcbgXHxm6z3BF9oohSKnMi6q+m/88r7ccAYDwDNhx4ZuEXndRTUwuhd
-hWjsxLRzAK1e4A3Kovwhls+dYPz+p+k3eOHjLW8CAwEAAaAAMA0GCSqGSIb3DQEB
-CwUAA4ICAQDC1v0WCbBGjZDUXpb2FTrfD4217w+7Nf8YOzXpsMBxBGmHg+29fZU6
-Z4vTal8qvSdRm0ElQzlzNhVkLl9iAAXWdGIKEfGuGbM37Ui+eUkTzG8JhCIA4b5H
-2VqH5qp5OCLSJHFwl5b+2JkNvTXf1mibM96Qjr3TJBXf+SkTHoUTIQ50S833lO6v
-gcTqobCjq0G87+nvIYC4Nb9JmWvnHHaGDenoWkiBDcF0+bcGXkFlVSsAtfQUgrE2
-4wVpt+bUnZPozj51aqDxIF9X50O2PVoeF6P81/0o51qGbf3mPDAflfVwr3CZ9lAB
-czhD8gEWB3oBBJH2LR+FxybwLzHpF8ddqm5hPCMXzCz3WdRufOz41/e2bJ16+sv3
-HCjr3l4Jmoy2UhHTTGu8+ZnuYKzji4fCjPA9uVI7C1SFJDSr0p4xsVW5SfUccUkx
-SK9SBmnySHuDHSZgEwHnzXeRefUJRFHP0X25rmgOUC8YMPkoVXvFs81fgOrl2XsW
-PDfiguyZNeVY12wHSgpVFXubczC/gGNw81gEvbVEafQRirjM1woDrWMAIdgU90z6
-S/1FmLhthMC4sPYFdRZRsBV/ME7QoiLQYpr55XgZAQVPomybsJpD879Ik17I+3yh
-1P/Gy7kJfLWHDZumQnMwy22kWJpBFDUvByTpc/YYZYnFZNG3cTE/YA==
------END CERTIFICATE REQUEST-----
diff --git a/tests/ca-less/certificates/httpd/ipaserver/cert.p12 b/tests/ca-less/certificates/httpd/ipaserver/cert.p12
deleted file mode 100644
index 1d3d1878c156e02892d6fb26492fad7976931f1e..0000000000000000000000000000000000000000
Binary files a/tests/ca-less/certificates/httpd/ipaserver/cert.p12 and /dev/null differ
diff --git a/tests/ca-less/certificates/httpd/ipaserver/cert.pem b/tests/ca-less/certificates/httpd/ipaserver/cert.pem
deleted file mode 100644
index 5f45d0642f43bf6ade69692e0ac460477a7593a4..0000000000000000000000000000000000000000
--- a/tests/ca-less/certificates/httpd/ipaserver/cert.pem
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFJjCCAw4CFBqeymww9zijAoCXaghDC4CFRqWEMA0GCSqGSIb3DQEBCwUAMEAx
-CzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARUZXN0MRAwDgYDVQQHDAdUZXN0aW5nMRAw
-DgYDVQQKDAdEZWZhdWx0MB4XDTIwMDUyNjE0NDkwMVoXDTIxMDUyNjE0NDkwMVow
-XzELMAkGA1UEBhMCVVMxDTALBgNVBAgMBFRlc3QxEDAOBgNVBAcMB1Rlc3Rpbmcx
-EDAOBgNVBAoMB0RlZmF1bHQxHTAbBgNVBAMMFGlwYXNlcnZlci50ZXN0LmxvY2Fs
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyKHds4chLXBaI9JjryUy
-ruX2lpSSYszz5YMhe1yNsebE3vgKeK5Br19kWxMAa3a3lvED5M6ebzyFH0KQeDVq
-CkI2fk+2GD6INS1Y7H2yaZrIs3R7rI3xLZVjxzLJK4JYYz3MKPnoxk8impy8aGQF
-4PVNy8UrjknIeIe4xdlaQxVP+/cyXv8Rr3LCAcV39B/qZc1Q/qsbpWs8Lty0s3+r
-RqMtrPNnOIXqMUIa/zCnmCIIHDZxEirhMbzLzNuPD1YiWGwtYtQsLDz36hDB9kP6
-nsLTAAz3U75O87DbXiSzTPY4yqTesoNRXCZAkHp+wlARwA0THkxssI6b/N2X1Trd
-7fe048ePvwR4RJzsp3mqVwB/PRH2PikIz23fFBbQF267kTLaGAV6TtK94/hCmC3v
-uTOlK5qA38zgztDWWE04FELQMFF5/Uw2rtBqFvtCch6gl1pn68Vg7ki29btdz7RM
-j2/NyWbJAlXZfBvRyMngmvo++C5R147jM3i8bWRONTY2XWot4yh9C1evSesY8uKm
-6uOZJpolMdtwACoXa3HNJgiSVloliVsygRDKmPfkHDku9yIGMKUalD7UKxBjPdaj
-6vNymJ6KcwHzpfanhb3F4q0izZN6d8xzc6EHXaJ5vJF3W1Q7UMBKDiCXnUn2WmOg
-6kW2xRMsazgPN7ustgLHrc0CAwEAATANBgkqhkiG9w0BAQsFAAOCAgEA4jJSI2tn
-HCYnXD7zjGWpG0H8EBMVbxL2fFAR1TLa318VD4cd4Lgj77QxW7fBcBOao7Z7FOgN
-7JXSCrI9fMbkc77LoN8G1xlUit/I28USlZf/XkqHu/li2GBTWu2vN6C4maIIGu7V
-z6WmZ2wMjUYlINhJ++9u182cquQE8u1cHEt1iERle+lNQMcwaIqlyQuGCIOumH77
-+Ny2325AWtn3zEtf8/edhPmiGDF5/k9TGB383VWVU6Ek9HCaGWmZYMMPGNlOPwhs
-nudLlyuA/5sX/NH8IJ4W37RcYnq1c9dg78Ryjbv/3ChDY+H6x+ZSqnSKbLzB4bU2
-KoMW1im1wkBgH+8qkmtsJxOGuser/UneFwO31OPHzKNa9kJzyXQOj89iWgbRUOo0
-I+8stNzly7Ihfy445PkIpVvfRKTXhTokXcN2a3k91ZnU5vqtOdvPMz8Ezs4zxtfR
-3xS5nZUEuNSjD5gGpF4tv1H9wMIxInYSfwQ1ilL6E/bw06NoWFEp0o7h4MhpB8MR
-fRc8zcWFa9JVZ3IA1SIP31yPYcQOAJaq/mQzneWFtIrqZSdg4o2BpTZaz/hgwoi/
-rPl0gpi4RBEmkxH4/cqq1lDiLhiqxv8MOpeMSAzyL7mRbmWBjSXOYSx4OsQzJq56
-oI205g+oJo+6cCKeutw9Hr6abinPPSyTjrk=
------END CERTIFICATE-----
diff --git a/tests/ca-less/certificates/httpd/ipaserver/private.key b/tests/ca-less/certificates/httpd/ipaserver/private.key
deleted file mode 100644
index d3e46c02e01904ce5936881da9891755cf8dd09e..0000000000000000000000000000000000000000
--- a/tests/ca-less/certificates/httpd/ipaserver/private.key
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN PRIVATE KEY-----
-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
-+Y5I+A88YGnol6am1ZLL/sVGcAw/cmizKA==
------END PRIVATE KEY-----
diff --git a/tests/ca-less/certificates/httpd/ipaserver/request.csr b/tests/ca-less/certificates/httpd/ipaserver/request.csr
deleted file mode 100644
index 1d7c428e9b6daf9a1df338eaa7cfe4cad183c4ee..0000000000000000000000000000000000000000
--- a/tests/ca-less/certificates/httpd/ipaserver/request.csr
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEpDCCAowCAQAwXzELMAkGA1UEBhMCVVMxDTALBgNVBAgMBFRlc3QxEDAOBgNV
-BAcMB1Rlc3RpbmcxEDAOBgNVBAoMB0RlZmF1bHQxHTAbBgNVBAMMFGlwYXNlcnZl
-ci50ZXN0LmxvY2FsMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyKHd
-s4chLXBaI9JjryUyruX2lpSSYszz5YMhe1yNsebE3vgKeK5Br19kWxMAa3a3lvED
-5M6ebzyFH0KQeDVqCkI2fk+2GD6INS1Y7H2yaZrIs3R7rI3xLZVjxzLJK4JYYz3M
-KPnoxk8impy8aGQF4PVNy8UrjknIeIe4xdlaQxVP+/cyXv8Rr3LCAcV39B/qZc1Q
-/qsbpWs8Lty0s3+rRqMtrPNnOIXqMUIa/zCnmCIIHDZxEirhMbzLzNuPD1YiWGwt
-YtQsLDz36hDB9kP6nsLTAAz3U75O87DbXiSzTPY4yqTesoNRXCZAkHp+wlARwA0T
-HkxssI6b/N2X1Trd7fe048ePvwR4RJzsp3mqVwB/PRH2PikIz23fFBbQF267kTLa
-GAV6TtK94/hCmC3vuTOlK5qA38zgztDWWE04FELQMFF5/Uw2rtBqFvtCch6gl1pn
-68Vg7ki29btdz7RMj2/NyWbJAlXZfBvRyMngmvo++C5R147jM3i8bWRONTY2XWot
-4yh9C1evSesY8uKm6uOZJpolMdtwACoXa3HNJgiSVloliVsygRDKmPfkHDku9yIG
-MKUalD7UKxBjPdaj6vNymJ6KcwHzpfanhb3F4q0izZN6d8xzc6EHXaJ5vJF3W1Q7
-UMBKDiCXnUn2WmOg6kW2xRMsazgPN7ustgLHrc0CAwEAAaAAMA0GCSqGSIb3DQEB
-CwUAA4ICAQBz0xmd8VCtFy3EPnNNtOovt/GOwTyinhouvD9V6n/pU6iCw5SH7Ypt
-n4hD90xBWh8K8idbp/TiIETE1iEorD+QrBs17yGD27EMyf169ikOWbKYOUAnj7ET
-wyFz90fwSq+MNsIY+j0w9yDUlGgbekhDs5AbcRWWi7g52gCMakiaP/HRH1MsyIpo
-sMFKgALPh2fiWKrde+D4bD8RyNhbrShuzHdxW6dUYoCGEzpB5pWIy8t3RPiwH8Eq
-5+n2kGf8whcyz6hLwkJecKu4gOCS18wj32p+K5sNJ195jWgVoakRFhnslwiQJmO/
-wTUL0U+QVQwzUETKcFqw7O1mrxoHq4WXf1IZsPeDkhTnt0PRqaSiY82hzuuwna7L
-VueLD2CSp7Eu4tqch4XogZjkMkqcwIhFMI3KolKBaO1bkUbcVG6jl0Z/XvEDta1M
-GFqeD3WBTMdOVHftGNa987MZMl+ISYv524JpcXEuEdZ0kNubgBZoC35LVjGcZ8+O
-nisrSvq2XCRow/DOJbL81XJFBUYBgU0IAMxM6jynWFCx9p2S5LeXEgjQVwm1qKtt
-MfQrC2oUWxTmRK/GodGX7IOTsETIXNPl3jTpk/A6BgnZntkfJ4cVWA5G4WPzM/9V
-IhhIejQMcaYECQlz6z+ZY8gHtXJ4tnP4AIKBzRPKbtQweTzOq9LVPg==
------END CERTIFICATE REQUEST-----
diff --git a/tests/ca-less/certificates/pkinit/ipaserver/cert.p12 b/tests/ca-less/certificates/pkinit/ipaserver/cert.p12
deleted file mode 100644
index 4f07df08814901953107944846dff1e5c79f7da3..0000000000000000000000000000000000000000
Binary files a/tests/ca-less/certificates/pkinit/ipaserver/cert.p12 and /dev/null differ
diff --git a/tests/ca-less/certificates/pkinit/ipaserver/cert.pem b/tests/ca-less/certificates/pkinit/ipaserver/cert.pem
deleted file mode 100644
index 8195d0e3249222e681b88e0ef2b3807b4840a4b8..0000000000000000000000000000000000000000
--- a/tests/ca-less/certificates/pkinit/ipaserver/cert.pem
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-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
------END CERTIFICATE-----
diff --git a/tests/ca-less/certificates/pkinit/ipaserver/private.key b/tests/ca-less/certificates/pkinit/ipaserver/private.key
deleted file mode 100644
index dfeb299ac80db172714c7e5ae6a3f867cab713aa..0000000000000000000000000000000000000000
--- a/tests/ca-less/certificates/pkinit/ipaserver/private.key
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN PRIVATE KEY-----
-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
-2aZkH8R/WtjkTLn2OqHDYMrnfNGpiw==
------END PRIVATE KEY-----
diff --git a/tests/ca-less/certificates/pkinit/ipaserver/request.csr b/tests/ca-less/certificates/pkinit/ipaserver/request.csr
deleted file mode 100644
index c1ca8f95d693d15e058d93ff636bcdc013fc4090..0000000000000000000000000000000000000000
--- a/tests/ca-less/certificates/pkinit/ipaserver/request.csr
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEpDCCAowCAQAwXzELMAkGA1UEBhMCVVMxDTALBgNVBAgMBFRlc3QxEDAOBgNV
-BAcMB1Rlc3RpbmcxEDAOBgNVBAoMB0RlZmF1bHQxHTAbBgNVBAMMFGlwYXNlcnZl
-ci50ZXN0LmxvY2FsMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA87+b
-5EePRdpmJ4ENdD7XZ3eNEHwT3G9crxt1HgcUEFIFK8wTaKUpOe78WTF7J/2W6qBK
-bmonVUokEJINzlwkVN637m3NM8GZuiqilWNYBjSpvKmpoSuOXPaBqYpa9swldnz6
-izJXOtrtZCh/XMsZAdIN1gum5+k1b3EJVN39D8EIXeDokLZMtmmnJx5PTW0xDVne
-z/HmFhZlCtX5wEG/9NAh1m6+Po4T4ojUJx5mnM/ZeheNcrP3unx6GNpAQUyZZpBf
-P4qv6bz0YyfS9//LBbBe4BbsBJZ2dpqVH4D3oqpiLvbRA5akuIxlYlNAGnnz65B6
-EKvyw4M5H3oOknj40rachuGYu39bERx2XhdX2G87FpMEbS3wUySr92tlT+7jLtMW
-o60lJuxmxhKVGoyq559E916hq7+6ghOxFCWV3NO5c1xJxwbPSyY9dcQJYv6uRK8z
-U8DaY1QDKCgkCKO8wyxoqMYUSYORvGA2OIq0JWpEjAByzxGr/gt8e6YyMYhGfdC7
-YAU23aM1R5J0rIIZmpuMjlbk5cZPQKyUMaw5q1YxWxVnNprTE3nSpmKzfRBuhrow
-oUoB4Kk8WuNdM9nC5aRgNWIxGq2qkSABNhUVH9g6JvavZ+QNW7aqI77/tlqhj66g
-9UMW49H/SYGoeLD2jB7ycBf8Tb01G6QvMptYQiMCAwEAAaAAMA0GCSqGSIb3DQEB
-CwUAA4ICAQBmvZXrkTm1tjHCNu1tvuzKuhohLSAeQZhFRjENQY8NjDgSdCjKhTp8
-jXxMe7ngWDhT2bt/tczn3eCI8vHugANo+Fh3tk88ZS9tXLHL+qkIye2KWq6kEVM8
-6JS3FVUfLuBs0sJ4IMLjst8vLPg1hpobXbqQXGkrHrO0frNlAAGTYq7G0CAg+blM
-MeOz+5R1yRsDXz0jXkpcvuHIARpGtCz/J4i9hb0Ws5+muNAX1esyGrlb3mAq2xYB
-tBr2/gYfoZ9OIpGLv+je1HPmXj7AsCEsDIh8L0JGYX1P2+gJk1sBqIWcxMRHXAa/
-mPJ5YArzOCfNYMyZ6OE7AZhEur9ZwTzxxoXTJhcpJQTIpGDkOImSTWbEcZwF2k1q
-51FEoy/hqGag287XjdTFXRtoxlxt67o4ejWtpGDDAFYi//cym1qTZERQqCxH+0Pe
-/CeqFOxf1Mjeu/fBU0/VIt1eXJ0Q3S8exa0MCCvJxIAiIICRr/oCxy3c17isv0+s
-uM72o1qnRfURoSwYrOFR6KCKetr3dWOtE2TJ9Fil2f6w6yQhQ1QWD9jdY6KXSU1L
-Hxf3zhlsKQL3qcClTeytr7jXJrx0R/Eo06hHIwuI17XdMSK7Ua8Ap0nJAKayCj3l
-iSp/WRlXFoUhk8FD/uHDTVI2DfrwUhwlel144qofPYC+HVXN+tkkjQ==
------END CERTIFICATE REQUEST-----
diff --git a/tests/ca-less/certificates/root-ca/cert.pem b/tests/ca-less/certificates/root-ca/cert.pem
deleted file mode 100644
index eb0638707a085a296bb6f7ba99cd35b17b5e4caa..0000000000000000000000000000000000000000
--- a/tests/ca-less/certificates/root-ca/cert.pem
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFYTCCA0mgAwIBAgIUP/sVAT04BHywYy3o+Vl0f4UcnBYwDQYJKoZIhvcNAQEL
-BQAwQDELMAkGA1UEBhMCVVMxDTALBgNVBAgMBFRlc3QxEDAOBgNVBAcMB1Rlc3Rp
-bmcxEDAOBgNVBAoMB0RlZmF1bHQwHhcNMjAwNTI2MTQ0OTAxWhcNMzAwNTI0MTQ0
-OTAxWjBAMQswCQYDVQQGEwJVUzENMAsGA1UECAwEVGVzdDEQMA4GA1UEBwwHVGVz
-dGluZzEQMA4GA1UECgwHRGVmYXVsdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
-AgoCggIBAOU+nW04Q13AgedYxhId89fL6X46S2jNh1soRAuih9ZXVnetT7x983x5
-CbrvC8Eg/Kgzjhb9Z81gHD6yIHaRyzkwSuth+RD+Kyc92Qmb/v+lThKk5DcuNXqm
-q5j9WtEPytW5U1LLm+eJDja5NZoHSPRgzRxgfPXg7Fv+psbUKN/pv7YOlIYq03X9
-/Gb72OJ08UGO6zEPZkkS0EDR/rTASzwtp5FU6XmbznPpN3SLX6YLZZAJ/XCCvx6Z
-zQLUoh0JFEhydY8YsQzlhjVNP2b4PkGTlrNH7LuvQFON0zXiioIZP91JIOWV12D3
-4TVvfW1hapBxsGdDBoayISQ6W6f39K1S5hr5nhjeecoaghlV2bbFP7OYQtXd5RAc
-A+El7uerwrKLJJMqLiSn59xGlNo7KlBnhW2bz69uFAYgZyJrj5LM5Zw6dAFaoLKY
-3Yd4dR1OSBQRN+jJu3Gltlghs/+hF59QUPR+3BHvAYuhD1NuP/x0M8bYNV2M4a9S
-UTOcZ3zU4OgMl+/+BhqXJiZu8VuaovWx8WzvDOSsHB4PgAodfo+svaZwy8q1wNOH
-OPmocR+sBXSHkNxI0axxaSAQ/0dzcqviCRAlnMuNMKGlYFJuHxNSmjTvv4AUJgAR
-AQ/gX2EKm3YAMp47vHUDcdjxT+lQYPJtNJ1sSqj9WJld6ibx1MxJAgMBAAGjUzBR
-MB0GA1UdDgQWBBQZfEM8LYDmDDK6Okxy+KtSraKVMDAfBgNVHSMEGDAWgBQZfEM8
-LYDmDDK6Okxy+KtSraKVMDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUA
-A4ICAQB/cYyFE/3g9dHzNzlp3t6UVwdNnB6q6D6WrHzfU+606sCOb5qdd340otZI
-s3CBL52UFcswfUCib5CqFWE22EJxZinxh0+GJO6Dm7sHH1Da4hm+UF0I9bLllyOe
-jCuYbbbP+zcC70yg36GPSrBawGQOzOjEgiJ9gaSvHKLGt9Qp976DTXnw4JNWzG77
-NeRKTITdX54YWZTg6ufmMUGYhdr8Rxy5DPxdhQZnH54L6jXjT/hktp59luEgVAhi
-6l7LuIigPC1TWAlsJc0T/sVtCBCdplj5bInvAcSL0A19KMlijJtyDQEzaz03l/dY
-frEdFeDXGdzIqMao60W+Mt/Jm4fM4kGf6ykXwBt49zSZmKqIr3/9Glsf3g4jDAvk
-lLt/0yL+KzRXp3BD4uY0sst/6fDThPPAQugS4egKIexTAy0qTug7yzPBK+hv7tu8
-3FONmJE1Eq2Q8eiypTBgCVP01oanr0428eSyvGTIvFxvV3qrryasykZ9siB1CVgo
-OHDon59wDY6AN/kEmB5hyR71RGrGnxTGAGier3jwD8LyDJE7HOrJzPYId+eTBwXx
-2kDM4OjK1G3Xu7Vs0MrzmFH+2z8BKYtTHoJDU/Ivh5idPy07cUSn+ED3WV5q8ci7
-J1feC1n0R9DczQpo9kLYUXVebdbtWTYs75k8fZUTdSFO/AJ9yQ==
------END CERTIFICATE-----
diff --git a/tests/ca-less/certificates/root-ca/cert.srl b/tests/ca-less/certificates/root-ca/cert.srl
deleted file mode 100644
index e7d0d5112d5b79823d54e170c8c00432edd94186..0000000000000000000000000000000000000000
--- a/tests/ca-less/certificates/root-ca/cert.srl
+++ /dev/null
@@ -1 +0,0 @@
-1A9ECA6C30F738A30280976A08430B808546A585
diff --git a/tests/ca-less/certificates/root-ca/private.key b/tests/ca-less/certificates/root-ca/private.key
deleted file mode 100644
index 867cb9912836f358e02174f02f8c49d3db65a2e4..0000000000000000000000000000000000000000
--- a/tests/ca-less/certificates/root-ca/private.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
diff --git a/tests/ca-less/generate-certificates.sh b/tests/ca-less/generate-certificates.sh
index 4d8d044dd58295cd0e22d06de9089a03b6e8557c..9c4c920edf7f29995de7222d5b9ac40e943e8a96 100755
--- a/tests/ca-less/generate-certificates.sh
+++ b/tests/ca-less/generate-certificates.sh
@@ -69,53 +69,48 @@ if [ -z "$domain" ]; then
     exit 0;
 fi
 
+# Generate certificate directories
+mkdir -p certificates/dirsrv/ipaserver
+mkdir -p certificates/httpd/ipaserver
+mkdir -p certificates/pkinit/ipaserver
+
+# Cleanup
+rm -f certificates/*/ipaserver/*
+rm -f certificates/root-ca/*
+
 # Generate root CA
-if [ ! -f "${ROOT_CA_DIR}/cert.pem" ]; then
-    openssl genrsa \
+openssl genrsa \
         -out ${ROOT_CA_DIR}/private.key 4096
 
-    openssl req -new -x509 -sha256 -nodes -days 3650 \
+openssl req -new -x509 -sha256 -nodes -days 3650 \
         -subj "/C=US/ST=Test/L=Testing/O=Default" \
         -key ${ROOT_CA_DIR}/private.key \
         -out ${ROOT_CA_DIR}/cert.pem
-fi
 
 # [ipaserver] Generate a certificate for the Directory Server
-if [ ! -f "${DIRSRV_CERTS_DIR}/ipaserver/cert.p12" ]; then
-    generate_ipa_pkcs12_certificate \
-        "dirsrv-cert" \
-        $master \
-        "${DIRSRV_CERTS_DIR}/ipaserver" \
-        "${ROOT_CA_DIR}/cert.pem" \
-        "${ROOT_CA_DIR}/private.key"
-else
-    echo "[ipaserver] Certificate for the Directory Server already exists."
-fi
+generate_ipa_pkcs12_certificate \
+    "dirsrv-cert" \
+    $master \
+    "${DIRSRV_CERTS_DIR}/ipaserver" \
+    "${ROOT_CA_DIR}/cert.pem" \
+    "${ROOT_CA_DIR}/private.key"
 
 # [ipaserver] Generate a certificate for the Apache server
-if [ ! -f "${HTTPD_CERTS_DIR}/ipaserver/cert.p12" ]; then
-    generate_ipa_pkcs12_certificate \
-        "httpd-cert" \
-        $master \
-        "${HTTPD_CERTS_DIR}/ipaserver" \
-        "${ROOT_CA_DIR}/cert.pem" \
-        "${ROOT_CA_DIR}/private.key"
-else
-    echo "[ipaserver] Certificate for the Apache server already exists."
-fi
+generate_ipa_pkcs12_certificate \
+    "httpd-cert" \
+    $master \
+    "${HTTPD_CERTS_DIR}/ipaserver" \
+    "${ROOT_CA_DIR}/cert.pem" \
+    "${ROOT_CA_DIR}/private.key"
 
 # [ipaserver] Generate a certificate for the KDC PKINIT
-if [ ! -f "${PKINIT_CERTS_DIR}/ipaserver/cert.p12" ]; then
-    export REALM=${domain^^}
-
-    generate_ipa_pkcs12_certificate \
-        "pkinit-cert" \
-        $master \
-        "${PKINIT_CERTS_DIR}/ipaserver" \
-        "${ROOT_CA_DIR}/cert.pem" \
-        "${ROOT_CA_DIR}/private.key" \
-        "${PKINIT_CERTS_DIR}/extensions.conf" \
-        "kdc_cert"
-else
-    echo "[ipaserver] Certificate for the KDC PKINIT already exists."
-fi
\ No newline at end of file
+export REALM=${domain^^}
+
+generate_ipa_pkcs12_certificate \
+    "pkinit-cert" \
+    $master \
+    "${PKINIT_CERTS_DIR}/ipaserver" \
+    "${ROOT_CA_DIR}/cert.pem" \
+    "${ROOT_CA_DIR}/private.key" \
+    "${PKINIT_CERTS_DIR}/extensions.conf" \
+    "kdc_cert"
diff --git a/tests/ca-less/install_server_without_ca.yml b/tests/ca-less/install_server_without_ca.yml
index bf04e504655a2551137e1b1c80047e89fe5132d5..dcdbdc59875cc1a9af5fdfff0849b7a0f6d9eefe 100644
--- a/tests/ca-less/install_server_without_ca.yml
+++ b/tests/ca-less/install_server_without_ca.yml
@@ -1,32 +1,66 @@
 ---
+- name: Generate certificates
+  hosts: localhost
+  gather_facts: false
+
+  tasks:
+  - name: Run generate-certificates.sh
+    command: >
+      /bin/bash
+      generate-certificates.sh
+      "{{ groups.ipaserver[0] }}"
+      "{{ ipaserver_domain | default(groups.ipaserver[0].split('.')[1:] | join ('.')) }}"
+    args:
+      chdir: "{{ playbook_dir }}"
+
 - name: Test ipaserver installation without CA
   hosts: ipaserver
   become: true
+
   vars:
     # Root CA certificate
     ipaserver_ca_cert_files:
-      - /root/freeipa/certificates/root-ca.crt
+      - /root/ca-less-test/ca.crt
     # Directory server certificates
     ipaserver_dirsrv_cert_name: dirsrv-cert
     ipaserver_dirsrv_cert_files:
-      - /root/freeipa/certificates/dirsrv.p12
+      - /root/ca-less-test/dirsrv.p12
     ipaserver_dirsrv_pin: SomePKCS12password
     # Apache certificates
     ipaserver_http_cert_name: httpd-cert
     ipaserver_http_cert_files:
-      - /root/freeipa/certificates/httpd.p12
+      - /root/ca-less-test/httpd.p12
     ipaserver_http_pin: SomePKCS12password
     # PKINIT configuration
     ipaserver_no_pkinit: no
     ipaserver_pkinit_cert_name: pkinit-cert
     ipaserver_pkinit_cert_files:
-      - /root/freeipa/certificates/pkinit.p12
+      - /root/ca-less-test/pkinit.p12
     ipaserver_pkinit_pin: SomePKCS12password
+
   pre_tasks:
-    - name: Copy certificates
+    - name: Remove "/root/ca-less-test"
+      file:
+        path: "/root/ca-less-test"
+        state: absent
+
+    - name: Generate "/root/ca-less-test"
+      file:
+        path: "/root/ca-less-test"
+        state: directory
+
+    - name: Copy CA certificate
+      copy:
+        src: "{{ playbook_dir }}/certificates/root-ca/cert.pem"
+        dest: "/root/ca-less-test/ca.crt"
+        owner: root
+        group: root
+        mode: "0644"
+
+    - name: Copy p12 certificates
       copy:
         src: "{{ playbook_dir }}/certificates/{{ item }}/ipaserver/cert.p12"
-        dest: "/root/freeipa/certificates/{{ item }}.p12"
+        dest: "/root/ca-less-test/{{ item }}.p12"
         owner: root
         group: root
         mode: "0644"
@@ -34,6 +68,7 @@
         - dirsrv
         - httpd
         - pkinit
+
   roles:
     - role: ipaserver
-      state: present
\ No newline at end of file
+      state: present