diff --git a/.github/workflows/roundtrip/config-demo-idp.sh b/.github/workflows/roundtrip/config-demo-idp.sh
index 532217b3..6978f161 100755
--- a/.github/workflows/roundtrip/config-demo-idp.sh
+++ b/.github/workflows/roundtrip/config-demo-idp.sh
@@ -42,5 +42,13 @@ kcadm.sh create clients -r opentdf \
   -s 'protocolMappers=[{"name":"aud","protocol":"openid-connect","protocolMapper":"oidc-audience-mapper","consentRequired":false,"config":{"access.token.claim":"true","included.custom.audience":"http://localhost:65432"}}]' \
   -s 'attributes={"dpop.bound.access.tokens":"true"}'
 
+kcadm.sh create clients -r opentdf \
+  -s clientId=testclient \
+  -s secret=secret \
+  -s enabled=true \
+  -s standardFlowEnabled=true \
+  -s serviceAccountsEnabled=true \
+  -s 'protocolMappers=[{"name":"aud","protocol":"openid-connect","protocolMapper":"oidc-audience-mapper","consentRequired":false,"config":{"access.token.claim":"true","included.custom.audience":"http://localhost:65432"}}]'
+
 kcadm.sh create users -r opentdf -s username=user1 -s enabled=true -s firstName=Alice -s lastName=User
 kcadm.sh set-password -r opentdf --username user1 --new-password testuser123
diff --git a/.github/workflows/roundtrip/encrypt-decrypt.sh b/.github/workflows/roundtrip/encrypt-decrypt.sh
index 1c3a2b76..51950bff 100755
--- a/.github/workflows/roundtrip/encrypt-decrypt.sh
+++ b/.github/workflows/roundtrip/encrypt-decrypt.sh
@@ -15,10 +15,9 @@ _nano_test() {
     --kasEndpoint http://localhost:65432/kas \
     --ignoreAllowList \
     --oidcEndpoint http://localhost:65432/auth/realms/opentdf \
-    --auth opentdf:secret \
+    --auth testclient:secret \
     --output sample.txt.ntdf \
-    encrypt "${plain}" \
-    --attributes https://example.com/attr/attr1/value/value1
+    encrypt "${plain}" 
 
   [ -f sample.txt.ntdf ]
 
@@ -26,7 +25,7 @@ _nano_test() {
     --kasEndpoint http://localhost:65432/kas \
     --ignoreAllowList \
     --oidcEndpoint http://localhost:65432/auth/realms/opentdf \
-    --auth opentdf:secret \
+    --auth testclient:secret \
     --output sample_out.txt \
     decrypt sample.txt.ntdf
 
@@ -46,11 +45,10 @@ _tdf3_test() {
     --kasEndpoint http://localhost:65432/kas \
     --ignoreAllowList \
     --oidcEndpoint http://localhost:65432/auth/realms/opentdf \
-    --auth opentdf:secret \
+    --auth testclient:secret \
     --output sample.txt.tdf \
     encrypt "${plain}" \
-    --containerType tdf3 \
-    --attributes https://example.com/attr/attr1/value/value1
+    --containerType tdf3 
 
   [ -f sample.txt.tdf ]
 
@@ -58,7 +56,7 @@ _tdf3_test() {
     --kasEndpoint http://localhost:65432/kas \
     --ignoreAllowList \
     --oidcEndpoint http://localhost:65432/auth/realms/opentdf \
-    --auth opentdf:secret \
+    --auth testclient:secret \
     --output sample_out.txt \
     --containerType tdf3 \
     decrypt sample.txt.tdf
diff --git a/.github/workflows/roundtrip/wait-and-test.sh b/.github/workflows/roundtrip/wait-and-test.sh
index e0a9764d..73eadc5e 100755
--- a/.github/workflows/roundtrip/wait-and-test.sh
+++ b/.github/workflows/roundtrip/wait-and-test.sh
@@ -162,11 +162,10 @@ if [ $1 = platform ]; then
   fi
 fi
 
-echo "[WARN] Skipping cli tests"
-# if ! "${APP}"; then
-#   echo "[ERROR] Encrypt/decrypt failure"
-#   exit 2
-# fi
+if ! "${APP}"; then
+  echo "[ERROR] Encrypt/decrypt failure"
+  exit 2
+fi
 
 if ! cd "${WEB_APP_DIR}"; then
   echo "[ERROR] Couldn't cd to web-app dir, [${WEB_APP_DIR}]"