diff --git a/tests/20_traefik_certificates_api.robot b/tests/20_traefik_certificates_api.robot
index c8eca48..52c9b63 100644
--- a/tests/20_traefik_certificates_api.robot
+++ b/tests/20_traefik_certificates_api.robot
@@ -75,7 +75,13 @@ Upload a custom certificate
     Should Be Equal As Integers    ${response}    1
     ${response} =    Execute Command    redis-cli --raw HGET module/traefik1/certificate/test.example.com custom
     Should Be Equal As Strings    ${response}    true
-    Execute Command    redis-cli HGET  module/traefik1/certificate/test.example.com cert | base64 -d > /dev/null
+    # check if the certificate stored is base64 encoded
+    ${response} = Execute Command    redis-cli HGET  module/traefik1/certificate/test.example.com cert | base64 -d > /dev/null    return_stdout=False    return_rc=True
+    Should Be Equal As Integers    ${response}    0
+    ${response} = Execute Command    redis-cli HGET  module/traefik1/certificate/test.example.com key | base64 -d > /dev/null    return_stdout=False    return_rc=True
+    Should Be Equal As Integers    ${response}    0
+        
+
     Execute Command    redis-cli HGET  module/traefik1/certificate/test.example.com key | base64 -d > /dev/null
 
 Delete custom certificate