diff --git a/src/plugins/aorai/tests/ya/metavariables-right.i b/src/plugins/aorai/tests/ya/metavariables-right.i
new file mode 100644
index 0000000000000000000000000000000000000000..b79672a08cd3aedaf53f1670418bdae7a28d5ea0
--- /dev/null
+++ b/src/plugins/aorai/tests/ya/metavariables-right.i
@@ -0,0 +1,28 @@
+/* run.config*
+   OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-test 1 -load-module tests/aorai/Aorai_test.cmxs -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+*/
+
+void f(int x) {}
+void g(void) {}
+void h(int x) {}
+void i(void) {}
+
+void main(int t)
+{
+  if (t) {
+    f(42);
+  }
+  else {
+    g();
+    goto L;
+  }
+
+  int x = 0;
+  while (x < 100)
+  {
+    h(x);
+    L: i();
+    x++;
+  }
+}
+
diff --git a/src/plugins/aorai/tests/ya/metavariables-right.ya b/src/plugins/aorai/tests/ya/metavariables-right.ya
new file mode 100644
index 0000000000000000000000000000000000000000..2e5be920ec14066807de4b2fdfc1fc1000a9bdda
--- /dev/null
+++ b/src/plugins/aorai/tests/ya/metavariables-right.ya
@@ -0,0 +1,29 @@
+%init:		a;
+%accept:	i;
+%deterministic;
+
+$x : int;
+
+a : { CALL(main) } -> b;
+
+b :
+  { CALL(f) && $x := f().x } -> c
+| { CALL(g) } -> d
+;
+
+c : { RETURN(f) } -> e;
+
+d : { RETURN(g) } -> g;
+
+e :
+  { CALL(h) && $x > 0 } -> f
+| { RETURN(main) } -> i
+;
+
+f : { RETURN(h) } -> g;
+
+g : { CALL(i) } -> h;
+
+h : { RETURN(i) && $x := 1 } -> e;
+
+i : -> i;
diff --git a/src/plugins/aorai/tests/ya/metavariables-wrong.i b/src/plugins/aorai/tests/ya/metavariables-wrong.i
new file mode 100644
index 0000000000000000000000000000000000000000..9f52b790bec17186283ae5411d201c2dbc707890
--- /dev/null
+++ b/src/plugins/aorai/tests/ya/metavariables-wrong.i
@@ -0,0 +1,22 @@
+/* run.config*
+   OPT: -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya -aorai-test 1 -load-module tests/aorai/Aorai_test.cmxs -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
+*/
+
+void f(int x) {}
+void g(void) {}
+void h(void) {}
+
+void main(void)
+{
+  int x = 0;
+  while (x < 100)
+  {
+    if (x % 2)
+      f(x);
+    else
+      g();
+    h();
+    x++;
+  }
+}
+
diff --git a/src/plugins/aorai/tests/ya/metavariables-wrong.ya b/src/plugins/aorai/tests/ya/metavariables-wrong.ya
new file mode 100644
index 0000000000000000000000000000000000000000..6ab66a2fa64bd1ca3deb72ef442aadd100a30835
--- /dev/null
+++ b/src/plugins/aorai/tests/ya/metavariables-wrong.ya
@@ -0,0 +1,23 @@
+%init:		a;
+%accept:	g;
+%deterministic;
+
+$x : int;
+
+a : { CALL(main) } -> b;
+
+b :
+  { CALL(f) && $x := f().x } -> c
+| { CALL(g) } -> d
+| { RETURN(main) } -> g
+;
+
+c : { RETURN(f) } -> e;
+
+d : { RETURN(g) } -> e;
+
+e : { CALL(h) && $x > 0 } -> f;
+
+f : { RETURN(h) } -> b;
+
+g : -> g;
diff --git a/src/plugins/aorai/tests/ya/oracle/metavariables-right.res.oracle b/src/plugins/aorai/tests/ya/oracle/metavariables-right.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..d816c5975a40c0944cdc2b7859bb3b1822e90c8c
--- /dev/null
+++ b/src/plugins/aorai/tests/ya/oracle/metavariables-right.res.oracle
@@ -0,0 +1,14 @@
+[kernel] Parsing tests/aorai/metavariables-right.i (no preprocessing)
+[kernel] tests/aorai/metavariables-right.i:10: 
+  syntax error:
+  Location: between lines 10 and 12, before or at token: void
+  8     void i() {}
+  9     
+  
+  10    volatile int v,
+  11    
+  12    void main(void)
+  
+  13    {
+  14      if (v) {
+[kernel] Frama-C aborted: invalid user input.
diff --git a/src/plugins/aorai/tests/ya/oracle/metavariables-wrong.res.oracle b/src/plugins/aorai/tests/ya/oracle/metavariables-wrong.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..42947ae08f475f95bca30d431b0141739f4542fa
--- /dev/null
+++ b/src/plugins/aorai/tests/ya/oracle/metavariables-wrong.res.oracle
@@ -0,0 +1,4 @@
+[kernel] Parsing tests/aorai/metavariables-wrong.i (no preprocessing)
+[aorai] Welcome to the Aorai plugin
+[aorai] User Error: The metavariables aorai_x may not be initialized before the transition from e to f_0.
+[kernel] Plug-in aorai aborted: invalid user input.