diff --git a/tests/RobotFramework/tests/tedge/certificate_signing_request.robot b/tests/RobotFramework/tests/tedge/certificate_signing_request.robot
new file mode 100644
index 00000000000..fad404ee13b
--- /dev/null
+++ b/tests/RobotFramework/tests/tedge/certificate_signing_request.robot
@@ -0,0 +1,65 @@
+*** Settings ***
+Resource            ../../resources/common.resource
+Library             ThinEdgeIO
+
+Test Teardown       Get Logs
+
+Test Tags           theme:cli
+
+
+*** Test Cases ***
+Generate CSR using the device-id from an existing certificate and private key
+    [Setup]    Setup With Self-Signed Certificate
+    ThinEdgeIO.File Should Exist    /etc/tedge/device-certs/tedge-certificate.pem
+    ThinEdgeIO.File Should Exist    /etc/tedge/device-certs/tedge-private-key.pem
+
+    ${hash_before_cert}=    Execute Command    md5sum /etc/tedge/device-certs/tedge-certificate.pem
+    ${hash_before_private_key}=    Execute Command    md5sum /etc/tedge/device-certs/tedge-private-key.pem
+
+    Execute Command    sudo tedge cert create-csr
+
+    ${output_cert_subject}=    Execute Command
+    ...    openssl x509 -noout -subject -in /etc/tedge/device-certs/tedge-certificate.pem
+    ${output_csr_subject}=    Execute Command
+    ...    openssl req -noout -subject -in /etc/tedge/device-certs/tedge.csr
+    Should Be Equal    ${output_cert_subject}    ${output_csr_subject}
+
+    ${output_private_key_md5}=    Execute Command
+    ...    openssl pkey -in /etc/tedge/device-certs/tedge-private-key.pem -pubout | openssl md5
+    ${output_csr_md5}=    Execute Command
+    ...    openssl req -in /etc/tedge/device-certs/tedge.csr -pubkey -noout | openssl md5
+    Should Be Equal    ${output_private_key_md5}    ${output_csr_md5}
+
+    ${hash_after_cert}=    Execute Command    md5sum /etc/tedge/device-certs/tedge-certificate.pem
+    ${hash_after_private_key}=    Execute Command    md5sum /etc/tedge/device-certs/tedge-private-key.pem
+    Should Be Equal    ${hash_before_cert}    ${hash_after_cert}
+    Should Be Equal    ${hash_before_private_key}    ${hash_after_private_key}
+
+Generate CSR without an existing certificate and private key
+    [Setup]    Setup Without Certificate
+    File Should Not Exist    /etc/tedge/device-certs/tedge-certificate.pem
+    File Should Not Exist    /etc/tedge/device-certs/tedge-private-key.pem
+
+    Execute Command    sudo tedge cert create-csr --device-id test-user
+
+    ${output_csr_subject}=    Execute Command
+    ...    openssl req -noout -subject -in /etc/tedge/device-certs/tedge.csr
+    Should Contain    ${output_csr_subject}    subject=CN = test-user
+
+    ${output_private_key_md5}=    Execute Command
+    ...    openssl pkey -in /etc/tedge/device-certs/tedge-private-key.pem -pubout | openssl md5
+    ${output_csr_md5}=    Execute Command
+    ...    openssl req -in /etc/tedge/device-certs/tedge.csr -pubkey -noout | openssl md5
+    Should Be Equal    ${output_private_key_md5}    ${output_csr_md5}
+
+
+*** Keywords ***
+Setup With Self-Signed Certificate
+    ${DEVICE_SN}=    Setup    skip_bootstrap=${True}
+    Set Test Variable    $DEVICE_SN
+    Execute Command    test -f ./bootstrap.sh && ./bootstrap.sh --cert-method selfsigned
+
+Setup Without Certificate
+    ${DEVICE_SN}=    Setup    skip_bootstrap=${True}
+    Set Test Variable    $DEVICE_SN
+    Execute Command    test -f ./bootstrap.sh && ./bootstrap.sh --install --no-bootstrap --no-connect