diff --git a/t/03-proxy_wasm/sdks/002-go_sdk/006-http_auth_random.t b/t/03-proxy_wasm/sdks/002-go_sdk/006-http_auth_random.t
index 5b6ac740e..4743e59d0 100644
--- a/t/03-proxy_wasm/sdks/002-go_sdk/006-http_auth_random.t
+++ b/t/03-proxy_wasm/sdks/002-go_sdk/006-http_auth_random.t
@@ -19,21 +19,30 @@ run_tests();
 __DATA__
 
 === TEST 1: proxy_wasm Go SDK - http_auth_random example
+--- skip_eval: 6: defined $ENV{TEST_NGINX_RANDOMIZE} && $ENV{TEST_NGINX_RANDOMIZE}
 --- timeout eval: $::ExtTimeout
 --- load_nginx_modules: ngx_http_echo_module
 --- main_config eval
 qq{
     wasm {
         module go_http_auth_random $ENV{TEST_NGINX_CRATES_DIR}/go_http_auth_random.wasm;
-        socket_connect_timeout $::ExtTimeout;
-        socket_send_timeout    $::ExtTimeout;
-        socket_read_timeout    $::ExtTimeout;
+    }
+}
+--- http_config
+server {
+    listen       2000;
+    server_name  httpbin;
+
+    location /uuid {
+        # Generating a uuid seems excessive; $request_id has some
+        # randomness on a distribution of runs of this test.
+        echo $request_id;
     }
 }
 --- config eval
 qq{
     resolver         $::ExtResolver;
-    resolver_timeout $::ExtTimeout;
+    resolver_add     127.0.0.1 httpbin;
 
     location /uuid {
         proxy_wasm go_http_auth_random;
diff --git a/util/build_proxy_wasm_go_sdk.sh b/util/build_proxy_wasm_go_sdk.sh
index 62d29e6e5..b176d25a9 100755
--- a/util/build_proxy_wasm_go_sdk.sh
+++ b/util/build_proxy_wasm_go_sdk.sh
@@ -51,7 +51,7 @@ pushd $DIR_PROXY_WASM_GO_SDK
              )
 
             -const clusterName = "httpbin"
-            +const clusterName = "httpbin.org"
+            +const clusterName = "httpbin:2000"
 
              func main() {
                     proxywasm.SetVMContext(&vmContext{})