diff --git a/authserv/test/test_integration.py b/authserv/test/test_integration.py
index 4047a7cf6c1521bdac5c1a1bf38cfc67fcd97341..62970c39d2395adc372f72239a231df0c320a411 100644
--- a/authserv/test/test_integration.py
+++ b/authserv/test/test_integration.py
@@ -16,6 +16,9 @@ from authserv import server
 
 URL = '/api/1/auth'
 
+# A 'difficult' password that requires encoding.
+TEST_PASSWORD = 'fagiano& +"% b^rb$g~=|{;\\i'
+
 
 def _relpath(x):
     return os.path.join(os.path.dirname(__file__), x)
@@ -54,8 +57,8 @@ class SSLServerTest(unittest.TestCase):
     def setup_class(cls):
         # set up the server in a separate process.
         cls.users = {
-            'user': FakeUser('user', 'pass'),
-            'user2': FakeUser('user2', 'pass2'),
+            'user': FakeUser('user', TEST_PASSWORD),
+            'user2': FakeUser('user2', TEST_PASSWORD),
         }
 
         cls.pid = 0
@@ -89,7 +92,7 @@ class SSLServerTest(unittest.TestCase):
         req = urllib2.Request('https://localhost:%d%s' % (self.port, URL),
                               data=urllib.urlencode(
                                   {'username': 'user2',
-                                   'password': 'pass2',
+                                   'password': TEST_PASSWORD,
                                    'service': 'svc',
                                    'source_ip': '127.0.0.1'}))
         self.assertRaises(urllib2.URLError, urllib2.urlopen, req)
@@ -98,7 +101,7 @@ class SSLServerTest(unittest.TestCase):
         req = urllib2.Request('https://localhost:%d%s' % (self.port, URL),
                               data=urllib.urlencode(
                                   {'username': 'user2',
-                                   'password': 'pass2',
+                                   'password': TEST_PASSWORD,
                                    'service': 'svc',
                                    'source_ip': '127.0.0.1'}))
         resp = self.opener.open(req)
diff --git a/pam/auth_client_test.cc b/pam/auth_client_test.cc
index 787af99f8bbbb11b7db2033bc0cf635f69050188..7a8be0d76109280af1e21dbaf46ba2d29ce89484 100644
--- a/pam/auth_client_test.cc
+++ b/pam/auth_client_test.cc
@@ -9,6 +9,9 @@ extern "C" {
 
 static const char *server = NULL;
 
+// Must match what is in authserv/test/test_integration.py.
+static const char *test_password = "fagiano& +\"% b^rb$g~=|{;\\i";
+
 static const char *ssl_ca = "../authserv/test/testca/public/ca.pem";
 static const char *ssl_cert = "../authserv/test/testca/public/certs/client.pem";
 static const char *ssl_key = "../authserv/test/testca/private/client.key";
@@ -62,7 +65,7 @@ TEST_F(AuthClientTest, AuthOK) {
   result = auth_client_set_certificate(ac, ssl_ca, ssl_cert, ssl_key);
   EXPECT_EQ(AC_OK, result) << "set_certificate() error: " << auth_client_strerror(result);
 
-  result = auth_client_authenticate(ac, "user", "pass", NULL, "127.0.0.1", NULL);
+  result = auth_client_authenticate(ac, "user", test_password, NULL, "127.0.0.1", NULL);
   EXPECT_EQ(AC_OK, result) << "authenticate() error: " << auth_client_strerror(result)
                            << ", server=" << server;
 }
@@ -75,7 +78,7 @@ TEST_F(AuthClientTest, ManyAuthOK) {
     result = auth_client_set_certificate(ac, ssl_ca, ssl_cert, ssl_key);
     EXPECT_EQ(AC_OK, result) << "set_certificate() error: " << auth_client_strerror(result);
     
-    result = auth_client_authenticate(ac, "user", "pass", NULL, "127.0.0.1", NULL);
+    result = auth_client_authenticate(ac, "user", test_password, NULL, "127.0.0.1", NULL);
     EXPECT_EQ(AC_OK, result) << "authenticate() error: " << auth_client_strerror(result)
                              << ", server=" << server;
   }
@@ -105,7 +108,7 @@ TEST_F(AuthClientTest, SSLFailsWithBadCertificate) {
   result = auth_client_set_certificate(ac, ssl_ca, ssl_ca, ssl_key);
   EXPECT_EQ(AC_OK, result) << "set_certificate() error: " << auth_client_strerror(result);
 
-  result = auth_client_authenticate(ac, "user", "pass", NULL, "127.0.0.1", NULL);
+  result = auth_client_authenticate(ac, "user", test_password, NULL, "127.0.0.1", NULL);
   EXPECT_NE(AC_OK, result) << "authenticate() didn't fail, server=" << server;
 }
 
@@ -116,7 +119,7 @@ TEST_F(AuthClientTest, SSLFailsWithBadCAClientSide) {
   result = auth_client_set_certificate(ac, ssl_bad_ca, ssl_cert, ssl_key);
   EXPECT_EQ(AC_OK, result) << "set_certificate() error: " << auth_client_strerror(result);
 
-  result = auth_client_authenticate(ac, "user", "pass", NULL, "127.0.0.1", NULL);
+  result = auth_client_authenticate(ac, "user", test_password, NULL, "127.0.0.1", NULL);
   EXPECT_NE(AC_OK, result) << "authenticate() didn't fail, server=" << server;
 }
 
@@ -127,7 +130,7 @@ TEST_F(AuthClientTest, SSLFailsWithBadCAServerSide) {
   result = auth_client_set_certificate(ac, ssl_ca, ssl_bad_cert, ssl_bad_key);
   EXPECT_EQ(AC_OK, result) << "set_certificate() error: " << auth_client_strerror(result);
 
-  result = auth_client_authenticate(ac, "user", "pass", NULL, "127.0.0.1", NULL);
+  result = auth_client_authenticate(ac, "user", test_password, NULL, "127.0.0.1", NULL);
   EXPECT_NE(AC_OK, result) << "authenticate() didn't fail, server=" << server;
 }
 
@@ -147,7 +150,7 @@ TEST_F(AuthClientServerFallbackTest, AuthOK) {
   result = auth_client_set_certificate(ac, ssl_ca, ssl_cert, ssl_key);
   EXPECT_EQ(AC_OK, result) << "set_certificate() error: " << auth_client_strerror(result);
 
-  result = auth_client_authenticate(ac, "user", "pass", NULL, "127.0.0.1", NULL);
+  result = auth_client_authenticate(ac, "user", test_password, NULL, "127.0.0.1", NULL);
   EXPECT_EQ(AC_OK, result) << "authenticate() error: " << auth_client_strerror(result)
                            << ", server=" << server;
 }