X-Git-Url: http://nitlanguage.org

diff --git a/src/loader.nit b/src/loader.nit
index 125866a..f18d7be 100644
--- a/src/loader.nit
+++ b/src/loader.nit
@@ -39,6 +39,7 @@ module loader
 
 import modelbuilder_base
 import ini
+import picnit_shared
 
 redef class ToolContext
 	# Option --path
@@ -65,6 +66,11 @@ redef class ModelBuilder
 		# Setup the paths value
 		paths.append(toolcontext.opt_path.value)
 
+		# Packages managed by picnit, only use when not testing with tests.sh
+		if "NIT_TESTING_TESTS_SH".environ != "true" then
+			paths.add picnit_lib_dir
+		end
+
 		var path_env = "NIT_PATH".environ
 		if not path_env.is_empty then
 			paths.append(path_env.split_with(':'))