diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb
index 6d621c339..e5fdae7ac 100644
--- a/source/core/ut_suite_cache_manager.pkb
+++ b/source/core/ut_suite_cache_manager.pkb
@@ -306,7 +306,7 @@ create or replace package body ut_suite_cache_manager is
     l_object_owner      varchar2(250) := upper(a_object_owner);
     l_object_name       varchar2(250) := upper(a_object_name);
   begin
-    if a_suite_items is not null and a_suite_items.count = 0 then
+    if a_suite_items is null or a_suite_items.count = 0 then
 
       delete from ut_suite_cache t
        where t.object_owner = l_object_owner
diff --git a/test/run_tests.sh b/test/run_tests.sh
index 9f69bd1a1..7d0431aec 100755
--- a/test/run_tests.sh
+++ b/test/run_tests.sh
@@ -4,6 +4,8 @@ set -ev
 #goto git root directory
 git rev-parse && cd "$(git rev-parse --show-cdup)"
 
+export NLS_LANG=AMERICAN_AMERICA.AL32UTF8
+
 time utPLSQL-cli/bin/utplsql run UT3_TESTER_HELPER/ut3@//${CONNECTION_STR} -D \
 -source_path=source -owner=ut3_develop \
 -p='ut3_tester,ut3_user' \
diff --git a/test/ut3_tester/core/test_suite_manager.pks b/test/ut3_tester/core/test_suite_manager.pks
index ac7818f4f..44f102716 100644
--- a/test/ut3_tester/core/test_suite_manager.pks
+++ b/test/ut3_tester/core/test_suite_manager.pks
@@ -163,7 +163,7 @@ create or replace package test_suite_manager is
 
   --%context(get_schema_ut_packages)
 
-  --%test(returns list of all unit test packages in given schema)
+  --%test(returns list of all unit test packages in given schema excluding packages that are not suites)
   --%beforetest(create_ut3_suite)
   --%aftertest(drop_ut3_suite)
   procedure test_get_schema_ut_packages;
diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb
index 6289b1642..9d65d6667 100644
--- a/test/ut3_tester_helper/run_helper.pkb
+++ b/test/ut3_tester_helper/run_helper.pkb
@@ -855,12 +855,23 @@ create or replace package body run_helper is
         --%test
         procedure some_test;
 
+      end;]';
+    execute immediate q'[
+      create or replace package ut3_develop.package_that_is_not_a_test
+      as
+        --%parameter(a comment inside)
+        --%parameters( description )
+
+        --%test
+        procedure some_test;
+
       end;]';
   end;
 
   procedure drop_ut3_suite is
     pragma autonomous_transaction;
   begin
+    execute immediate q'[drop package ut3_develop.package_that_is_not_a_test]';
     execute immediate q'[drop package ut3_develop.some_test_package]';
   end;