diff --git a/cmake/HPX_AddTest.cmake b/cmake/HPX_AddTest.cmake
index b1de975580e9..beceaf8ebd23 100644
--- a/cmake/HPX_AddTest.cmake
+++ b/cmake/HPX_AddTest.cmake
@@ -198,7 +198,7 @@ function(add_hpx_test category name)
       if(_add_test)
         set(_full_name "${category}.distributed.gasnet.${name}")
         add_test(NAME "${_full_name}" COMMAND ${cmd} "-p" "gasnet" "-r"
-                                              "gasnet" ${args}
+                                              "amudprun" ${args}
         )
         set_tests_properties(
           "${_full_name}"
diff --git a/cmake/templates/hpxrun.py.in b/cmake/templates/hpxrun.py.in
index ac1530ab6f63..0b39ea13ae8c 100755
--- a/cmake/templates/hpxrun.py.in
+++ b/cmake/templates/hpxrun.py.in
@@ -228,9 +228,8 @@ def run_jsrun(cmd, localities, verbose):
 def run(cmd, runwrapper, localities, nodes, verbose):
     if runwrapper == 'none':
         run_none(cmd, localities, nodes, verbose)
-    if runwrapper == 'gasnet':
-        #run_amudprun(cmd, localities, nodes, verbose)
-        run_srun(cmd, localities, verbose)
+    if runwrapper == 'amudprun':
+        run_amudprun(cmd, localities, nodes, verbose)
     if runwrapper == 'mpi':
         assert nodes is None, "nodes option only valid with tcp parcelport."
         run_mpi(cmd, localities, verbose)
@@ -299,7 +298,7 @@ def check_options(parser, options, args):
         sys.exit(1)
 
     check_valid_runwrapper = (lambda x:
-            x == 'none' or x == 'mpi' or x == 'srun' or x =='jsrun' or x == 'gasnet');
+            x == 'none' or x == 'mpi' or x == 'srun' or x =='jsrun' or x == 'amudprun');
     if not check_valid_runwrapper(options.runwrapper):
         print('Error: Runwrapper option not valid\n', sys.stderr)
         parser.print_help()
@@ -384,7 +383,7 @@ Used by the tcp parcelport only.
     parser.add_option('-r', '--runwrapper'
       , action='store', type='string'
       , dest='runwrapper', default=default_env('HPXRUN_RUNWRAPPER', 'none')
-      , help='Which runwrapper to use (Options are: none, mpi, gasnet, srun, jsrun) '
+      , help='Which runwrapper to use (Options are: none, mpi, amudprun, srun, jsrun) '
              '(environment variable HPXRUN_RUNWRAPPER)')
 
     parser.add_option('-e', '--expected'