4 files changed, 14 insertions, 22 deletions
diff --git a/tests/micropython/builtin_execfile.py b/tests/micropython/builtin_execfile.py
index 9b6d6a0aa..a905521c6 100644
--- a/tests/micropython/builtin_execfile.py
+++ b/tests/micropython/builtin_execfile.py
@@ -1,11 +1,10 @@
 # Test builtin execfile function using VFS.
 
 try:
-    import io, os
+    import io, os, vfs
 
     execfile
     io.IOBase
-    os.mount
 except (ImportError, NameError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -44,25 +43,21 @@ class Filesystem:
 
 # First umount any existing mount points the target may have.
 try:
-    import io, os
-
-    os.umount("/")
+    vfs.umount("/")
 except OSError:
     pass
 for path in os.listdir("/"):
-    os.umount("/" + path)
+    vfs.umount("/" + path)
 
 # Create and mount the VFS object.
 files = {
     "/test.py": "print(123)",
 }
 fs = Filesystem(files)
-os.mount(fs, "/test_mnt")
+vfs.mount(fs, "/test_mnt")
 
 # Test execfile with a file that doesn't exist.
 try:
-    import io, os
-
     execfile("/test_mnt/noexist.py")
 except OSError:
     print("OSError")
@@ -77,4 +72,4 @@ except TypeError:
     print("TypeError")
 
 # Unmount the VFS object.
-os.umount(fs)
+vfs.umount(fs)
diff --git a/tests/micropython/import_mpy_invalid.py b/tests/micropython/import_mpy_invalid.py
index 36db102e9..c7f0a2c1a 100644
--- a/tests/micropython/import_mpy_invalid.py
+++ b/tests/micropython/import_mpy_invalid.py
@@ -1,10 +1,9 @@
 # test importing of invalid .mpy files
 
 try:
-    import sys, io, os
+    import sys, io, vfs
 
     io.IOBase
-    os.mount
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -52,7 +51,7 @@ user_files = {
 }
 
 # create and mount a user filesystem
-os.mount(UserFS(user_files), "/userfs")
+vfs.mount(UserFS(user_files), "/userfs")
 sys.path.append("/userfs")
 
 # import .mpy files from the user filesystem
@@ -64,5 +63,5 @@ for i in range(len(user_files)):
         print(mod, "ValueError", er)
 
 # unmount and undo path addition
-os.umount("/userfs")
+vfs.umount("/userfs")
 sys.path.pop()
diff --git a/tests/micropython/import_mpy_native.py b/tests/micropython/import_mpy_native.py
index da20746b2..8f5de25a0 100644
--- a/tests/micropython/import_mpy_native.py
+++ b/tests/micropython/import_mpy_native.py
@@ -1,11 +1,10 @@
 # test importing of .mpy files with native code
 
 try:
-    import sys, io, os
+    import sys, io, vfs
 
     sys.implementation._mpy
     io.IOBase
-    os.mount
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -110,7 +109,7 @@ user_files = {
 # fmt: on
 
 # create and mount a user filesystem
-os.mount(UserFS(user_files), "/userfs")
+vfs.mount(UserFS(user_files), "/userfs")
 sys.path.append("/userfs")
 
 # import .mpy files from the user filesystem
@@ -123,5 +122,5 @@ for i in range(len(user_files)):
         print(mod, "ValueError", er)
 
 # unmount and undo path addition
-os.umount("/userfs")
+vfs.umount("/userfs")
 sys.path.pop()
diff --git a/tests/micropython/import_mpy_native_gc.py b/tests/micropython/import_mpy_native_gc.py
index e0da8d2c3..6b8d7ddd6 100644
--- a/tests/micropython/import_mpy_native_gc.py
+++ b/tests/micropython/import_mpy_native_gc.py
@@ -1,11 +1,10 @@
 # Test that native code loaded from a .mpy file is retained after a GC.
 
 try:
-    import gc, sys, io, os
+    import gc, sys, io, vfs
 
     sys.implementation._mpy
     io.IOBase
-    os.mount
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -72,7 +71,7 @@ if sys_implementation_mpy not in features0_file_contents:
 user_files = {"/features0.mpy": features0_file_contents[sys_implementation_mpy]}
 
 # Create and mount a user filesystem.
-os.mount(UserFS(user_files), "/userfs")
+vfs.mount(UserFS(user_files), "/userfs")
 sys.path.append("/userfs")
 
 # Import the native function.
@@ -93,5 +92,5 @@ for i in range(1000):
 print(factorial(10))
 
 # Unmount and undo path addition.
-os.umount("/userfs")
+vfs.umount("/userfs")
 sys.path.pop()