diff --git a/src/oo/cl_oo_factory.clas.abap b/src/oo/cl_oo_factory.clas.abap
index 2af80753..a850b1cd 100644
--- a/src/oo/cl_oo_factory.clas.abap
+++ b/src/oo/cl_oo_factory.clas.abap
@@ -31,7 +31,7 @@ CLASS cl_oo_factory IMPLEMENTATION.
 
   METHOD if_oo_clif_source~get_source.
     DATA ls_data TYPE reposrc.
-    SELECT SINGLE * FROM reposrc INTO ls_data WHERE progname = mv_name.
+    SELECT SINGLE * FROM reposrc INTO @ls_data WHERE progname = @mv_name.
     SPLIT ls_data-data AT |\n| INTO TABLE source.
   ENDMETHOD.
 ENDCLASS.
\ No newline at end of file
diff --git a/src/unit/osql/cl_osql_test_environment.clas.abap b/src/unit/osql/cl_osql_test_environment.clas.abap
index 2661e971..7994597b 100644
--- a/src/unit/osql/cl_osql_test_environment.clas.abap
+++ b/src/unit/osql/cl_osql_test_environment.clas.abap
@@ -45,7 +45,7 @@ CLASS cl_osql_test_environment IMPLEMENTATION.
       TRY.
           CREATE DATA ref TYPE (lv_table).
           ASSIGN ref->* TO <fs>.
-          SELECT SINGLE * FROM (lv_table) INTO <fs>.
+          SELECT SINGLE * FROM (lv_table) INTO @<fs>.
         CATCH cx_sy_create_data_error cx_sy_dynamic_osql_semantics.
           WRITE '@KERNEL throw new Error(`table ${lv_table.get().trimEnd()} invalid or does not exist`);'.
       ENDTRY.
@@ -124,7 +124,7 @@ CLASS cl_osql_test_environment IMPLEMENTATION.
     READ TABLE mt_tables WITH KEY table_line = lv_table TRANSPORTING NO FIELDS.
     ASSERT sy-subrc = 0.
 
-    INSERT (lv_table) FROM TABLE i_data.
+    INSERT (lv_table) FROM TABLE @i_data.
     ASSERT sy-subrc = 0.
 
   ENDMETHOD.
diff --git a/src/unit/osql/cl_osql_test_environment.clas.testclasses.abap b/src/unit/osql/cl_osql_test_environment.clas.testclasses.abap
index dcbb1870..bc64370d 100644
--- a/src/unit/osql/cl_osql_test_environment.clas.testclasses.abap
+++ b/src/unit/osql/cl_osql_test_environment.clas.testclasses.abap
@@ -16,7 +16,7 @@ CLASS ltcl_test IMPLEMENTATION.
     DATA lt_after  TYPE ty_tdevc.
     DATA ls_row    TYPE tdevc.
 
-    SELECT * FROM tdevc INTO TABLE lt_before ORDER BY PRIMARY KEY.
+    SELECT * FROM tdevc INTO TABLE @lt_before ORDER BY PRIMARY KEY.
 
     APPEND 'TDEVC' TO lt_tables.
     li_environment = cl_osql_test_environment=>create( lt_tables ).
@@ -24,7 +24,7 @@ CLASS ltcl_test IMPLEMENTATION.
     INSERT ls_row INTO TABLE lt_insert.
     li_environment->insert_test_data( lt_insert ).
 
-    SELECT * FROM tdevc INTO TABLE lt_double ORDER BY PRIMARY KEY.
+    SELECT * FROM tdevc INTO TABLE @lt_double ORDER BY PRIMARY KEY.
     cl_abap_unit_assert=>assert_equals(
       act = lt_double
       exp = lt_insert ).
@@ -32,7 +32,7 @@ CLASS ltcl_test IMPLEMENTATION.
     li_environment->destroy( ).
 
 * check table is back to normal
-    SELECT * FROM tdevc INTO TABLE lt_after ORDER BY PRIMARY KEY.
+    SELECT * FROM tdevc INTO TABLE @lt_after ORDER BY PRIMARY KEY.
     cl_abap_unit_assert=>assert_equals(
       act = lt_after
       exp = lt_before ).