4 files changed, 12 insertions, 8 deletions
diff --git a/tests/aes128_user/client.conf b/tests/aes128_user/client.conf
index 98dd4c4..614baff 100644
--- a/tests/aes128_user/client.conf
+++ b/tests/aes128_user/client.conf
@@ -1,11 +1,14 @@
 # Client — test: aes128_user
 
 applicationUri = urn:localhost:bobink:ClientFindServers
+
 certificate = certs/ClientFindServers_cert.der
 privateKey = certs/ClientFindServers_key.der
+trustStore = certs/trust/client
+
 securityMode = SignAndEncrypt
 securityPolicy = Aes128_Sha256_RsaOaep
+
 authMode = user
 username = user
 password = password
-trustStore = certs/trust/client
diff --git a/tests/aes128_user/server_lds.conf b/tests/aes128_user/server_lds.conf
index 2cc4b2e..86bf196 100644
--- a/tests/aes128_user/server_lds.conf
+++ b/tests/aes128_user/server_lds.conf
@@ -2,12 +2,13 @@
 
 port = 14840
 applicationUri = urn:localhost:bobink:ServerLDS
+
 certificate = certs/ServerLDS_cert.der
 privateKey = certs/ServerLDS_key.der
-cleanupTimeout = 60
+trustStore = certs/trust/server_lds
 
 authMode = user
 username = user
 password = password
 
-trustStore = certs/trust/server_lds
+cleanupTimeout = 60
diff --git a/tests/aes128_user/server_register.conf b/tests/aes128_user/server_register.conf
index 077afc2..3c4c88a 100644
--- a/tests/aes128_user/server_register.conf
+++ b/tests/aes128_user/server_register.conf
@@ -2,13 +2,13 @@
 
 port = 14841
 applicationUri = urn:localhost:bobink:ServerRegister
+
 certificate = certs/ServerRegister_cert.der
 privateKey = certs/ServerRegister_key.der
-
-registerInterval = 10
+trustStore = certs/trust/server_register
 
 authMode = user
 username = user
 password = password
 
-trustStore = certs/trust/server_register
+registerInterval = 10
diff --git a/tests/aes128_user/server_register_client.conf b/tests/aes128_user/server_register_client.conf
index 252bbd6..3e976be 100644
--- a/tests/aes128_user/server_register_client.conf
+++ b/tests/aes128_user/server_register_client.conf
@@ -1,8 +1,10 @@
 # ServerRegister client config — test: aes128_user
 
 applicationUri = urn:localhost:bobink:ServerRegister
+
 certificate = certs/ServerRegisterClient_cert.der
 privateKey = certs/ServerRegisterClient_key.der
+trustStore = certs/trust/server_register_client
 
 securityMode = SignAndEncrypt
 securityPolicy = Aes128_Sha256_RsaOaep
@@ -10,5 +12,3 @@ securityPolicy = Aes128_Sha256_RsaOaep
 authMode = user
 username = user
 password = password
-
-trustStore = certs/trust/server_register_client