diff --git a/core/expression.class.inc.php b/core/expression.class.inc.php
new file mode 100644
index 000000000..1e76b9bda
--- /dev/null
+++ b/core/expression.class.inc.php
@@ -0,0 +1,4 @@
+<?php
+// The file has been moved in iTop 2.2.0+ (revision 3803)
+// Preserve backward compatibility with some external tools (Cf. toolkit)
+require_once(APPROOT.'core/oql/expression.class.inc.php');
diff --git a/setup/runtimeenv.class.inc.php b/setup/runtimeenv.class.inc.php
index 1bc8aa9d4..646f7ca40 100644
--- a/setup/runtimeenv.class.inc.php
+++ b/setup/runtimeenv.class.inc.php
@@ -75,7 +75,7 @@ class RunTimeEnvironment
 		require_once(APPROOT.'/core/filterdef.class.inc.php');
 		require_once(APPROOT.'/core/stimulus.class.inc.php');
 		require_once(APPROOT.'/core/MyHelpers.class.inc.php');
-		require_once(APPROOT.'/core/expression.class.inc.php');
+		require_once(APPROOT.'/core/oql/expression.class.inc.php');
 		require_once(APPROOT.'/core/cmdbsource.class.inc.php');
 		require_once(APPROOT.'/core/sqlquery.class.inc.php');
 		require_once(APPROOT.'/core/sqlobjectquery.class.inc.php');
diff --git a/test/test.class.inc.php b/test/test.class.inc.php
index 1a7383c06..1d3d1d790 100644
--- a/test/test.class.inc.php
+++ b/test/test.class.inc.php
@@ -30,7 +30,7 @@ require_once(APPROOT.'/core/filterdef.class.inc.php');
 require_once(APPROOT.'/core/stimulus.class.inc.php');
 require_once(APPROOT.'/core/MyHelpers.class.inc.php');
 
-require_once(APPROOT.'/core/expression.class.inc.php');
+require_once(APPROOT.'/core/oql/expression.class.inc.php');
 require_once(APPROOT.'/core/cmdbsource.class.inc.php');
 require_once(APPROOT.'/core/sqlquery.class.inc.php');
 require_once(APPROOT.'/core/sqlobjectquery.class.inc.php');