diff --git a/geant/gap_ansible/roles/iptrunk_twamp/templates/juniper/twamp_client.j2 b/geant/gap_ansible/roles/iptrunk_twamp/templates/juniper/twamp_client.j2
index e6abd4536c60d572ddd1a30f6ad0c73fad599237..2b4b1d120ebeb41a7b021f92d3da89b33ce06e8d 100644
--- a/geant/gap_ansible/roles/iptrunk_twamp/templates/juniper/twamp_client.j2
+++ b/geant/gap_ansible/roles/iptrunk_twamp/templates/juniper/twamp_client.j2
@@ -2,11 +2,12 @@ services {
   rpm {
     twamp {
       client {
-replace: control-connection {{ remote_side_short_name }} {
+replace: control-connection "{{ local_side_short_name }}--{{ remote_side_short_name }}"
           destination-port {{ juniper_twamp_client.destination_port }};
           history-size {{ juniper_twamp_client.history_size }};
           target-address {{ remote_side_address }};
           test-count {{ juniper_twamp_client.test_count }};
+          test-interval {{ juniper_twamp_client.test_interval }};
           test-session "{{ local_side_short_name }}--{{ remote_side_short_name }}" {
             target-address {{ remote_side_address }};
             data-fill-with-zeros;