diff --git a/enos/enos-scenario-e2e-aws-rdp-base.hcl b/enos/enos-scenario-e2e-aws-rdp-base.hcl
index dfb4bd23a..935a1f9dc 100644
--- a/enos/enos-scenario-e2e-aws-rdp-base.hcl
+++ b/enos/enos-scenario-e2e-aws-rdp-base.hcl
@@ -310,6 +310,7 @@ scenario "e2e_aws_rdp_base" {
       target_rdp_member_server_user            = step.create_rdp_member_server.admin_username
       target_rdp_member_server_password        = step.create_rdp_member_server.password
       target_rdp_domain_name                   = step.create_rdp_domain_controller.domain_name
+      target_rdp_server_version                = matrix.rdp_server
       client_ip_public                         = step.create_windows_client.public_ip
       client_username                          = step.create_windows_client.test_username
       client_password                          = step.create_windows_client.test_password
@@ -317,6 +318,7 @@ scenario "e2e_aws_rdp_base" {
       vault_addr_public                        = step.create_vault_cluster.instance_public_ips_ipv4[0]
       vault_addr_private                       = step.create_vault_cluster.instance_private_ips[0]
       vault_root_token                         = step.create_vault_cluster.vault_root_token
+      client_version                           = matrix.client
     }
   }
 
diff --git a/enos/modules/test_e2e/main.tf b/enos/modules/test_e2e/main.tf
index 773e86009..29d1c4409 100644
--- a/enos/modules/test_e2e/main.tf
+++ b/enos/modules/test_e2e/main.tf
@@ -196,6 +196,16 @@ variable "target_rdp_domain_name" {
   type        = string
   default     = ""
 }
+variable "target_rdp_server_version" {
+  description = "Server version of rdp target"
+  type        = string
+  default     = ""
+}
+variable "client_version" {
+  description = "Client version of RDP client"
+  type        = string
+  default     = ""
+}
 variable "client_ip_public" {
   description = "Public IP of the client machine"
   type        = string
@@ -275,10 +285,12 @@ resource "enos_local_exec" "run_e2e_test" {
     E2E_TARGET_RDP_MEMBER_SERVER_USER            = var.target_rdp_member_server_user
     E2E_TARGET_RDP_MEMBER_SERVER_PASSWORD        = var.target_rdp_member_server_password
     E2E_TARGET_RDP_DOMAIN_NAME                   = var.target_rdp_domain_name
+    E2E_TARGET_RDP_SERVER_VERSION                = var.target_rdp_server_version
     E2E_CLIENT_IP_PUBLIC                         = var.client_ip_public
     E2E_CLIENT_USERNAME                          = var.client_username
     E2E_CLIENT_PASSWORD                          = var.client_password
     E2E_CLIENT_TEST_DIR                          = var.client_test_dir
+    E2E_CLIENT_VERSION                           = var.client_version
   }
 
   inline = var.debug_no_run ? [""] : [