diff --git a/jedi/evaluate/names.py b/jedi/evaluate/names.py
index 8df3b183..0392f3e2 100644
--- a/jedi/evaluate/names.py
+++ b/jedi/evaluate/names.py
@@ -210,7 +210,7 @@ class ImportName(AbstractNameDefinition):
                 if module_names is None:
                     return module_names
                 return module_names + (self.string_name,)
-            return self.string_name
+            return (self.string_name,)
         return ()
 
     @property
diff --git a/test/test_api/test_keyword.py b/test/test_api/test_keyword.py
index af8a8b0b..6321d06e 100644
--- a/test/test_api/test_keyword.py
+++ b/test/test_api/test_keyword.py
@@ -42,7 +42,7 @@ def test_keyword_attributes(Script):
     assert def_.docstring()
     assert def_.description == 'keyword def'
     assert def_.get_line_code() == ''
-    assert def_.full_name == 'def'
+    assert def_.full_name is None
     assert def_.line is def_.column is None
     assert def_.in_builtin_module() is True
     assert def_.module_name in ('builtins', '__builtin__')
diff --git a/test/test_evaluate/test_compiled.py b/test/test_evaluate/test_compiled.py
index 9d4d1fc1..599d6b5b 100644
--- a/test/test_evaluate/test_compiled.py
+++ b/test/test_evaluate/test_compiled.py
@@ -169,4 +169,4 @@ def test_qualified_names(same_process_evaluator, obj, expected_names):
         same_process_evaluator,
         DirectObjectAccess(same_process_evaluator, obj)
     )
-    assert o.get_qualified_names() == expected_names
+    assert o.get_qualified_names() == tuple(expected_names)