diff --git a/src/xmpp/test/SConscript b/src/xmpp/test/SConscript
index 39d91122e40..d86d7864e7a 100644
--- a/src/xmpp/test/SConscript
+++ b/src/xmpp/test/SConscript
@@ -89,7 +89,6 @@ test_suite = [
 ]
 
 flaky_test_suite = [
-    xmpp_pubsub_test,
     xmpp_stream_message_client_test,
     xmpp_stream_message_server_test,
 ]
diff --git a/src/xmpp/testdata/server-build02.key b/src/xmpp/testdata/server-build02.key
old mode 100755
new mode 100644
index e19f1d70439..6aa6d4f42eb
--- a/src/xmpp/testdata/server-build02.key
+++ b/src/xmpp/testdata/server-build02.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCqSSupa9ppGVHU8ZyART2UMaN+/8uOjbT8YYLDjgQadJObPxUQ
-u7LjayLPAFpx0fjiahKbLt30E5v1Imu+X6yMQWbEzBxW9KYsL4zQHzwBZg1JMnMv
-CqlzL7D/Xt16uHyrq6uZgWj79nbLnzsbW4IGfMTYHNgGZO+hTPkqHi02nQIDAQAB
-AoGBAJ7PHqkirM7XjjnKGuqFqKhMou4OIQkRn3jAd/NovurtTbu7WSoB4xO1FwF2
-kuMTr8l4o2GWk+jNYOV89H7XO1MMRPN6LLR07QybfsGvOHAXF0wvTk7SItmQBYho
-fbHELZJKqB2xVGmg3rqPQDFvUZpADns792NQSwbwtxakZr0BAkEA3/bvGRuwgGlO
-XzrhWSFdm/y6e0ugfxQgieghJ7M9Vghab4MsYeYEbG5Tz+B6ZI8i4SlCGslBbfOO
-Hnm1dK76iwJBAMKkpOpbVASVUh4Cu2Ga6ScNMWbkjIhtMs2Yg69/6O/cO0lRALgY
-+B7F36Ayap3wb7sRjaeCLGelIBEE65EcQHcCQCj5bmjzjekQWwxFI3FBD3U4WY2x
-Gl3lesaAN4Ch5DjXMmRwZTBL+sczsBW6Bepb3Y/AEp3/7/6Drp6Yub/tO10CQQC4
-kCQscQMfAXQHLvH9IEXamMDyXt7+8gSNPQQJItF+t6aj46I57rs/esOMhKHiNz3K
-9V8LqfxvHv1kBfVU+KQLAkBO3VaeGako9AMqW2uXjgHVzY5xQqJ94A0G4aumiq1m
-bTuJK5rM1Pwd+0728wBruSnXrO9nw9Q1cTZZrciieayI
+MIICXQIBAAKBgQC+0+fnG1TCgWE52mUMuKtwsiy9IakTKIJ5Tf+aKrr7CWCJEoZr
+Z3Lpk0lgqSZ78asLR2rg7TCyQgZySULcNDxti0SQeUzuAjqvqwPLj2uoo5AULPlf
+zO5eux2HKOzerpbRNqtyJasn09f8bX8fjCMWDqyPO88q6g4FQzJsYC/H/wIDAQAB
+AoGAcrSp9y9kma5vpPj0ONtgolNXtTBgk1WMaCJMfH0m+/M9BegOyMzcNC8GsoW6
+zlIMQLFjO2UYGm65tUT4XalAkIZBQzleiUGPrGe36fRwSHySlk/G/apZf6LUTtq8
+yzWN4gWM0K4b3Q8C26O2Ts2Qz/D3iWquDTzHnwVwC+PfhLECQQDpjF+Vws0sq4Wp
+d+fN4ArcGNp1X6CfGQhp11GvL+PIcnK2zOTAh+EOxI/kYRMUyaVwO++e6nS4Zqfy
+0MSmryJrAkEA0SwtwKGmCfGXAISCciijjqY3bWfhnLPOJZQ7OfOh5NkoqDF769WM
+IOzvl7nqzhfcWgcSuZtljkbxGEr63cfdvQJAeaBC/ykt1L+WokTxkUPGJA1FZ67f
+ZTuSKBycS5GzHGaN2yklUCbzS8+N6C+t0juZTrPH/Ii5NHcxq8CRSQUX9QJBAMkX
+XODtRvAWV2JDAhl34k24lF7U2LxKzCuqhwnepEybTQ/tisIeKbpZrrlCHm+F1uyi
+EiloMMkIgK4nH2hpxk0CQQCOXySFBSrIl2Lym9ShldGh2u4XLwQTCrD3iIJVGqbo
+EnjT48m5lfhV6UMDaeESQWumSIQIyDl6Ox0o66OB93ug
 -----END RSA PRIVATE KEY-----
diff --git a/src/xmpp/testdata/server-build02.pem b/src/xmpp/testdata/server-build02.pem
old mode 100755
new mode 100644
index 7088247bc7e..a236b344897
--- a/src/xmpp/testdata/server-build02.pem
+++ b/src/xmpp/testdata/server-build02.pem
@@ -1,26 +1,28 @@
 -----BEGIN CERTIFICATE-----
-MIIBqzCCARQCCQDcNdwZyj+FpjANBgkqhkiG9w0BAQUFADAaMQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCQ0EwHhcNMTUwMzA1MjEyMjU1WhcNMTYwMzA0MjEyMjU1WjAa
-MQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0A
-MIGJAoGBAKpJK6lr2mkZUdTxnIBFPZQxo37/y46NtPxhgsOOBBp0k5s/FRC7suNr
-Is8AWnHR+OJqEpsu3fQTm/Uia75frIxBZsTMHFb0piwvjNAfPAFmDUkycy8KqXMv
-sP9e3Xq4fKurq5mBaPv2dsufOxtbggZ8xNgc2AZk76FM+SoeLTadAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADgYEAi7/+X06NJ4lfwp2mQCASGhQKzxBZ33SSx/wsgT15ljlg
-RcydHTwuZ7SHiS7X7FQoYwL5iXmYifAn4X4fmGZSzeBQCM4FRsvXR1egWkHcBvdw
-R9l/L3Kux4salSKPhmSYQ/YYiyzscWxE4ZSsfdKraC92kCMeo1S6FdUPe3nu7vc=
+MIIB8TCCAVoCCQC1yDDwZCr+NTANBgkqhkiG9w0BAQsFADA9MQswCQYDVQQGEwJV
+UzELMAkGA1UECAwCQ0ExITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0
+ZDAeFw0xNjAzMDgyMjQ2NDJaFw0zNjAzMDMyMjQ2NDJaMD0xCzAJBgNVBAYTAlVT
+MQswCQYDVQQIDAJDQTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRk
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+0+fnG1TCgWE52mUMuKtwsiy9
+IakTKIJ5Tf+aKrr7CWCJEoZrZ3Lpk0lgqSZ78asLR2rg7TCyQgZySULcNDxti0SQ
+eUzuAjqvqwPLj2uoo5AULPlfzO5eux2HKOzerpbRNqtyJasn09f8bX8fjCMWDqyP
+O88q6g4FQzJsYC/H/wIDAQABMA0GCSqGSIb3DQEBCwUAA4GBALtPYLswOiK4DAXJ
+9i1Zc3FJe+WFTM2JFgNIVUY5t8qhX1cHzan366P/mm49mhBUCTn0JJsFjiOCImhT
+yqxRf2TExKG4XLPCCQP7xP5lLSt9UrqgzF4I079IGv8jjkg35QptAMutpd9jSFdJ
+JpIK6fYU4D6uQmeU1i0n/aius0Ut
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCqSSupa9ppGVHU8ZyART2UMaN+/8uOjbT8YYLDjgQadJObPxUQ
-u7LjayLPAFpx0fjiahKbLt30E5v1Imu+X6yMQWbEzBxW9KYsL4zQHzwBZg1JMnMv
-CqlzL7D/Xt16uHyrq6uZgWj79nbLnzsbW4IGfMTYHNgGZO+hTPkqHi02nQIDAQAB
-AoGBAJ7PHqkirM7XjjnKGuqFqKhMou4OIQkRn3jAd/NovurtTbu7WSoB4xO1FwF2
-kuMTr8l4o2GWk+jNYOV89H7XO1MMRPN6LLR07QybfsGvOHAXF0wvTk7SItmQBYho
-fbHELZJKqB2xVGmg3rqPQDFvUZpADns792NQSwbwtxakZr0BAkEA3/bvGRuwgGlO
-XzrhWSFdm/y6e0ugfxQgieghJ7M9Vghab4MsYeYEbG5Tz+B6ZI8i4SlCGslBbfOO
-Hnm1dK76iwJBAMKkpOpbVASVUh4Cu2Ga6ScNMWbkjIhtMs2Yg69/6O/cO0lRALgY
-+B7F36Ayap3wb7sRjaeCLGelIBEE65EcQHcCQCj5bmjzjekQWwxFI3FBD3U4WY2x
-Gl3lesaAN4Ch5DjXMmRwZTBL+sczsBW6Bepb3Y/AEp3/7/6Drp6Yub/tO10CQQC4
-kCQscQMfAXQHLvH9IEXamMDyXt7+8gSNPQQJItF+t6aj46I57rs/esOMhKHiNz3K
-9V8LqfxvHv1kBfVU+KQLAkBO3VaeGako9AMqW2uXjgHVzY5xQqJ94A0G4aumiq1m
-bTuJK5rM1Pwd+0728wBruSnXrO9nw9Q1cTZZrciieayI
+MIICXQIBAAKBgQC+0+fnG1TCgWE52mUMuKtwsiy9IakTKIJ5Tf+aKrr7CWCJEoZr
+Z3Lpk0lgqSZ78asLR2rg7TCyQgZySULcNDxti0SQeUzuAjqvqwPLj2uoo5AULPlf
+zO5eux2HKOzerpbRNqtyJasn09f8bX8fjCMWDqyPO88q6g4FQzJsYC/H/wIDAQAB
+AoGAcrSp9y9kma5vpPj0ONtgolNXtTBgk1WMaCJMfH0m+/M9BegOyMzcNC8GsoW6
+zlIMQLFjO2UYGm65tUT4XalAkIZBQzleiUGPrGe36fRwSHySlk/G/apZf6LUTtq8
+yzWN4gWM0K4b3Q8C26O2Ts2Qz/D3iWquDTzHnwVwC+PfhLECQQDpjF+Vws0sq4Wp
+d+fN4ArcGNp1X6CfGQhp11GvL+PIcnK2zOTAh+EOxI/kYRMUyaVwO++e6nS4Zqfy
+0MSmryJrAkEA0SwtwKGmCfGXAISCciijjqY3bWfhnLPOJZQ7OfOh5NkoqDF769WM
+IOzvl7nqzhfcWgcSuZtljkbxGEr63cfdvQJAeaBC/ykt1L+WokTxkUPGJA1FZ67f
+ZTuSKBycS5GzHGaN2yklUCbzS8+N6C+t0juZTrPH/Ii5NHcxq8CRSQUX9QJBAMkX
+XODtRvAWV2JDAhl34k24lF7U2LxKzCuqhwnepEybTQ/tisIeKbpZrrlCHm+F1uyi
+EiloMMkIgK4nH2hpxk0CQQCOXySFBSrIl2Lym9ShldGh2u4XLwQTCrD3iIJVGqbo
+EnjT48m5lfhV6UMDaeESQWumSIQIyDl6Ox0o66OB93ug
 -----END RSA PRIVATE KEY-----