diff --git a/jedi/inference/gradual/typing.py b/jedi/inference/gradual/typing.py
index ab0b449b..8e90f249 100644
--- a/jedi/inference/gradual/typing.py
+++ b/jedi/inference/gradual/typing.py
@@ -327,6 +327,9 @@ class Tuple(BaseTypingValueWithGenerics):
         from jedi.inference.gradual.annotation import merge_pairwise_generics, merge_type_var_dicts
         from jedi.inference.gradual.base import GenericClass
 
+        if is_class_value:
+            value_set = value_set.execute_annotation()
+
         if self._is_homogenous():
             # The parameter annotation is of the form `Tuple[T, ...]`,
             # so we treat the incoming tuple like a iterable sequence
@@ -343,8 +346,12 @@ class Tuple(BaseTypingValueWithGenerics):
 
             type_var_dict = {}
             for element in value_set:
-                py_class = element.get_annotated_class_object()
-                if not isinstance(py_class, GenericClass):
+                if not is_class_value:
+                    py_class = element.get_annotated_class_object()
+
+                    if not isinstance(py_class, GenericClass):
+                        py_class = element
+                else:
                     py_class = element
 
                 merge_type_var_dicts(
diff --git a/test/completion/pep0484_generic_mismatches.py b/test/completion/pep0484_generic_mismatches.py
index 47add048..64721b8c 100644
--- a/test/completion/pep0484_generic_mismatches.py
+++ b/test/completion/pep0484_generic_mismatches.py
@@ -33,6 +33,7 @@ tpl_typed = ("2", 3)  # type: Tuple[str, int]
 collection = {"a": 1}
 collection_typed = {"a": 1}  # type: Dict[str, int]
 
+list_of_ints = [42]  # type: List[int]
 list_of_funcs = [foo]  # type: List[Callable[[T], T]]
 
 custom_generic = CustomGeneric(123.45)
@@ -323,3 +324,21 @@ x7
 for a in list_t_to_list_t(12):
     #?
     a
+
+
+def list_tuple_t_to_tuple_list_t(the_list: List[Tuple[T]]) -> Tuple[List[T], ...]:
+    return tuple(list(x) for x in the_list)
+
+
+for b in list_tuple_t_to_tuple_list_t(list_of_ints):
+    #?
+    b[0]
+
+
+def list_tuple_t_elipsis_to_tuple_list_t(the_list: List[Tuple[T, ...]]) -> Tuple[List[T], ...]:
+    return tuple(list(x) for x in the_list)
+
+
+for b in list_tuple_t_to_tuple_list_t(list_of_ints):
+    #?
+    b[0]
diff --git a/test/completion/pep0484_generic_parameters.py b/test/completion/pep0484_generic_parameters.py
index 89572d99..41408215 100644
--- a/test/completion/pep0484_generic_parameters.py
+++ b/test/completion/pep0484_generic_parameters.py
@@ -6,6 +6,7 @@ from typing import (
     Iterable,
     List,
     Mapping,
+    Tuple,
     Type,
     TypeVar,
     Union,
@@ -59,6 +60,28 @@ for b in list_type_t_to_list_t(list_of_int_type):
     b
 
 
+def list_tuple_t_to_tuple_list_t(the_list: List[Tuple[T]]) -> Tuple[List[T], ...]:
+    return tuple(list(x) for x in the_list)
+
+
+list_of_int_tuples = [(x,) for x in list_of_ints]  # type: List[Tuple[int]]
+
+for b in list_tuple_t_to_tuple_list_t(list_of_int_tuples):
+    #? int()
+    b[0]
+
+
+def list_tuple_t_elipsis_to_tuple_list_t(the_list: List[Tuple[T, ...]]) -> Tuple[List[T], ...]:
+    return tuple(list(x) for x in the_list)
+
+
+list_of_int_tuples = [tuple(list_of_ints)]  # type: List[Tuple[int, ...]]
+
+for b in list_tuple_t_elipsis_to_tuple_list_t(list_of_int_tuples):
+    #? int()
+    b[0]
+
+
 def foo(x: T) -> T:
     return x