diff --git a/test/vm/peek-freed.c b/test/vm/peek-freed.c
index e266bdcf35f92564aabce8dc1519b5c1cbca9f74..6cc84f3bc973f43090456668529a732c4f814063 100644
--- a/test/vm/peek-freed.c
+++ b/test/vm/peek-freed.c
@@ -7,6 +7,7 @@ int main()
 {
     int *a = malloc( 4 );
     free( a );
-    __vm_peek( a, _VM_ML_User ); /* ERROR */
+    __vm_pointer_t ptr = __vm_pointer_split( a );
+    __vm_peek( _VM_ML_User, ptr.obj, ptr.off, 1 ); /* ERROR */
     return 0;
 }
diff --git a/test/vm/peek-freed2.c b/test/vm/peek-freed2.c
index 91743f9859a3e5b4d2b187b8f9707a3f510b8129..0c22a8b8626a7785df00af7ecc90f5f3e0d7ecfc 100644
--- a/test/vm/peek-freed2.c
+++ b/test/vm/peek-freed2.c
@@ -8,9 +8,10 @@ int main()
     int *a = malloc( 4 );
     if ( a )
     {
-        __vm_poke( a, _VM_ML_User, 20 );
+        __vm_pointer_t ptr = __vm_pointer_split( a );
+        __vm_poke( _VM_ML_User, ptr.obj, ptr.off, 1, 20 );
         free( a );
-        __vm_peek( a, _VM_ML_User ); /* ERROR */
+        __vm_peek( _VM_ML_User, ptr.obj, ptr.off, 1 ); /* ERROR */
     }
     return 0;
 }
diff --git a/test/vm/peek-invalid.c b/test/vm/peek-invalid.c
index 091a60f603037d699c05019f86db7c99feac6c62..9374b70aa956560c38ff76fbafa4f54f06d530e5 100644
--- a/test/vm/peek-invalid.c
+++ b/test/vm/peek-invalid.c
@@ -5,6 +5,7 @@
 int main()
 {
     int *a;
-    __vm_peek( a, _VM_ML_User ); /* ERROR */
+    __vm_pointer_t ptr = __vm_pointer_split( a );
+    __vm_peek( _VM_ML_User, ptr.obj, ptr.off, 1 ); /* ERROR */
     return 0;
 }
diff --git a/test/vm/peek-user.pkg.c b/test/vm/peek-user.pkg.c
index ce4da0e8a4899285b0568938764edee196bcbef2..0dd360836c7a8f2f6f4e304469594645557dae00 100644
--- a/test/vm/peek-user.pkg.c
+++ b/test/vm/peek-user.pkg.c
@@ -9,11 +9,12 @@
 int main()
 {
     int a;
-    __vm_poke( &a, _VM_ML_User, 32 );
+    __vm_pointer_t ptr = __vm_pointer_split( &a );
+    __vm_poke( _VM_ML_User, ptr.obj, ptr.off, 1, 32 );
 #ifdef SUSPEND
     __dios_suspend();
 #endif
-    int p = __vm_peek( &a, _VM_ML_User );
-    assert( p == 32 );
+    __vm_meta_t meta = __vm_peek( _VM_ML_User, ptr.obj, ptr.off, 1 );
+    assert( meta.value == 32 );
     return 0;
 }
diff --git a/test/vm/poke-freed.c b/test/vm/poke-freed.c
index 019a1ca0cd6347243a10f99e666d00237987c8c3..36b5c5358ffeb75b3d89ba6e9c0170134bf1dba2 100644
--- a/test/vm/poke-freed.c
+++ b/test/vm/poke-freed.c
@@ -7,6 +7,7 @@ int main()
 {
     int *a = malloc( 4 );
     free( a );
-    __vm_poke( a, _VM_ML_User, 0 ); /* ERROR */
+    __vm_pointer_t ptr = __vm_pointer_split( a );
+    __vm_poke( _VM_ML_User, ptr.obj, ptr.off, 1, 0 ); /* ERROR */
     return 0;
 }
diff --git a/test/vm/poke-invalid.c b/test/vm/poke-invalid.c
index 775f8a9332a97d1d9724445dfa317bfac596bc13..3f34b7f9dacc5f17b1a12f732dfb27c9766dec8e 100644
--- a/test/vm/poke-invalid.c
+++ b/test/vm/poke-invalid.c
@@ -5,6 +5,7 @@
 int main()
 {
     int *a;
-    __vm_poke( a, _VM_ML_User, 0 ); /* ERROR */
+    __vm_pointer_t ptr = __vm_pointer_split( a );
+    __vm_poke( _VM_ML_User, ptr.obj, ptr.off, 1, 0 ); /* ERROR */
     return 0;
 }