diff --git a/python/helpers/pycharm/django_test_manage.py b/python/helpers/pycharm/django_test_manage.py
index 9723dd24d630..ee7b6ea391b7 100644
--- a/python/helpers/pycharm/django_test_manage.py
+++ b/python/helpers/pycharm/django_test_manage.py
@@ -9,11 +9,12 @@ manage_file = os.getenv('PYCHARM_DJANGO_MANAGE_MODULE')
 if not manage_file:
   manage_file = 'manage'
 
-settings_file = os.getenv('PYCHARM_DJANGO_SETTINGS_MODULE') or os.getenv('DJANGO_SETTINGS_MODULE')
+settings_file = os.getenv('DJANGO_SETTINGS_MODULE')
 if not settings_file:
     settings_file = 'settings'
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE')
+proj_name = sys.argv[-1]
+os.environ.setdefault('DJANGO_SETTINGS_MODULE',proj_name+".settings")
 
 from django.core import management
 from django.core.management.commands.test import Command
@@ -96,7 +97,7 @@ if __name__ == "__main__":
     subcommand = 'help' # Display help if no arguments were given.
 
   if subcommand == 'test':
-    utility = PycharmTestManagementUtility()
+    utility = PycharmTestManagementUtility(sys.argv[:-1])
   else:
     utility = ManagementUtility()
   utility.execute()
\ No newline at end of file