diff --git a/tests/hal-stream/test.py b/tests/hal-stream/streamtest.py
similarity index 100%
rename from tests/hal-stream/test.py
rename to tests/hal-stream/streamtest.py
diff --git a/tests/hal-stream/test.hal b/tests/hal-stream/test.hal
index a0055ff2cdd..647cfe0e1a9 100644
--- a/tests/hal-stream/test.hal
+++ b/tests/hal-stream/test.hal
@@ -1 +1 @@
-loadusr -w ./test.py
+loadusr -w ./streamtest.py
diff --git a/tests/raster/test b/tests/raster/rastertest.py
similarity index 99%
rename from tests/raster/test
rename to tests/raster/rastertest.py
index af44c73404c..7ff1c2af394 100755
--- a/tests/raster/test
+++ b/tests/raster/rastertest.py
@@ -252,7 +252,6 @@ def main():
     finally:
         c.exit()
         prog.exit()
-        os.system('halrun -U')
     return 0
 
 if __name__ == "__main__":
diff --git a/tests/raster/test.hal b/tests/raster/test.hal
new file mode 100644
index 00000000000..e006f87ed30
--- /dev/null
+++ b/tests/raster/test.hal
@@ -0,0 +1 @@
+loadusr -w ./rastertest.py