diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 2fd8b94..5ec50a7 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "version.h"
 #include "torture/torture.h"
 #include "lib/events/events.h"
 #include "auth/auth.h"
@@ -2111,9 +2112,10 @@ static bool test_GetDomainInfo(struct torture_context *tctx,
 {
 	NTSTATUS status;
 	struct netr_LogonGetDomainInfo r;
-	struct netr_DomainQuery1 q1;
+	struct netr_WorkstationInfomation q1;
 	struct netr_Authenticator a;
 	struct netlogon_creds_CredentialState *creds;
+	struct netr_os_version_container os;
 	union netr_DomainInfo info;
 
 	if (!test_SetupCredentials3(p, tctx, NETLOGON_NEG_AUTH2_ADS_FLAGS, 
@@ -2133,17 +2135,22 @@ static bool test_GetDomainInfo(struct torture_context *tctx,
 	r.out.return_authenticator = &a;
 	r.out.info = &info;
 
-	r.in.query.query1 = &q1;
+	r.in.query.workstation_info = &q1;
 	ZERO_STRUCT(q1);
 	
 	/* this should really be the fully qualified name */
-	q1.workstation_domain = TEST_MACHINE_NAME;
+	q1.dns_hostname = TEST_MACHINE_NAME;
 	q1.workstation_site = "Default-First-Site-Name";
-	q1.blob2.length = 0;
-	q1.blob2.size = 0;
-	q1.blob2.array = NULL;
-	q1.product.string = "product string";
+	q1.os_version.os = &os;
+	q1.os_name.string = "product string";
+
+	ZERO_STRUCT(os);
 
+	os.os.MajorVersion = SAMBA_VERSION_MAJOR;
+	os.os.MinorVersion = SAMBA_VERSION_MINOR;
+	os.os.BuildNumber = SAMBA_VERSION_ALPHA_RELEASE;
+	os.os.CSDVersion = "Samba " SAMBA_VERSION_STRING;
+	os.os.ServicePackMinor = SAMBA_VERSION_RELEASE;
 	torture_comment(tctx, "Testing netr_LogonGetDomainInfo\n");
 
 	status = dcerpc_netr_LogonGetDomainInfo(p, tctx, &r);
@@ -2175,7 +2182,7 @@ static bool test_GetDomainInfo_async(struct torture_context *tctx,
 {
 	NTSTATUS status;
 	struct netr_LogonGetDomainInfo r;
-	struct netr_DomainQuery1 q1;
+	struct netr_WorkstationInfomation q1;
 	struct netr_Authenticator a;
 #define ASYNC_COUNT 100
 	struct netlogon_creds_CredentialState *creds;
@@ -2199,7 +2206,7 @@ static bool test_GetDomainInfo_async(struct torture_context *tctx,
 	r.out.return_authenticator = &a;
 	r.out.info = &info;
 
-	r.in.query.query1 = &q1;
+	r.in.query->workstation_info = &q1;
 	ZERO_STRUCT(q1);
 	
 	/* this should really be the fully qualified name */