diff --git a/.gitignore b/.gitignore
index cef66ab..f29b8cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 *.6
 *.8
 *.os
-_cgo_*.*
+_cgo_*
 *.cgo1.go
 *.cgo2.c
 .sconsign*
diff --git a/goscons/gopkg.py b/goscons/gopkg.py
index fbc279e..2f647a9 100644
--- a/goscons/gopkg.py
+++ b/goscons/gopkg.py
@@ -87,7 +87,7 @@ def gopackage(env, srcdir, basedir=None, *args, **kw):
         env.AlwaysBuild(a)
         env.AlwaysBuild(env.Alias('test', a))
         alias = 'bench_%s' % pkgname_
-        a = env.Alias(alias, t, '$GOTESTRUNNER ${SOURCES.abspath} -benchmarks=. -match="Do not run tests" $GOTESTARGS')
+        a = env.Alias(alias, t, '$GOTESTRUNNER ${SOURCES.abspath} -test.bench=. -test.run="Do not run tests" $GOTESTARGS')
         env.AlwaysBuild(a)
         env.AlwaysBuild(env.Alias('bench', a))
 
diff --git a/goscons/gotest.py b/goscons/gotest.py
index d9139a2..384cecc 100644
--- a/goscons/gotest.py
+++ b/goscons/gotest.py
@@ -53,7 +53,7 @@ def emitter(target, source, env):
 def generate(env):
     env['BUILDERS']['GoTestMain'] = GoTestMainBuilder
     env['GOTESTMAINCOM'] = GoTestMainAction
-    env['GOTESTARGS'] = SCons.Util.CLVar('-v=true')
+    env['GOTESTARGS'] = SCons.Util.CLVar('-test.v=true')
     env['GOPACKAGE'] = None
 
 def exists(env):