diff --git a/src/gnc-module/test/mod-bar/bar-gwrap.scm b/src/gnc-module/test/mod-bar/bar-gwrap.scm
index 5c5270d9a0..731d95e0c0 100644
--- a/src/gnc-module/test/mod-bar/bar-gwrap.scm
+++ b/src/gnc-module/test/mod-bar/bar-gwrap.scm
@@ -1,17 +1,20 @@
 (use-modules (g-wrap))
-
 (debug-set! maxdepth 100000)
 (debug-set! stack 2000000)
 
-(let ((mod (gw:new-module "bar-gwrap")))
-  (gw:module-depends-on mod "gw-runtime")
-  (gw:module-set-declarations-ccodegen! 
-   mod 
-   (lambda (unused) 
-     (list "#include \"bar.h\"\n")))
+(use-modules (g-wrap gw-standard-spec))
+
+(let ((ws (gw:new-wrapset "bar-gwrap")))
+
+  (gw:wrapset-depends-on ws "gw-standard")
+
+  (gw:wrapset-add-cs-declarations! 
+   ws
+   (lambda (wrapset client-wrapset) 
+     "#include \"bar.h\"\n"))
 
   (gw:wrap-function
-   mod 'bar:hello
-   '<gw:bool> "bar_hello"
-   '()
+   ws
+   'bar:hello
+   '<gw:bool> "bar_hello" '()
    "Print a simple message from C"))