diff --git a/jedi/evaluate/context.py b/jedi/evaluate/context.py
index 4ea56e03..2b2080a1 100644
--- a/jedi/evaluate/context.py
+++ b/jedi/evaluate/context.py
@@ -1,3 +1,4 @@
+from jedi._compatibility import Python3Method
 from jedi.common import unite
 
 
@@ -42,9 +43,11 @@ class Context(object):
     def eval_stmt(self, stmt, seek_name=None):
         return self.evaluator.eval_statement(self, stmt, seek_name)
 
+    @Python3Method
     def eval_trailer(self, types, trailer):
         return self.evaluator.eval_trailer(self, types, trailer)
 
+    @Python3Method
     def py__getattribute__(self, name_or_str, name_context=None, position=None,
                            search_global=False, is_goto=False):
         if name_context is None:
diff --git a/test/test_parser/test_diff_parser.py b/test/test_parser/test_diff_parser.py
index be678e24..68d73383 100644
--- a/test/test_parser/test_diff_parser.py
+++ b/test/test_parser/test_diff_parser.py
@@ -78,7 +78,7 @@ class Differ(object):
     def initialize(self, source):
         debug.dbg('differ: initialize', color='YELLOW')
         grammar = load_grammar()
-        self.parser = ParserWithRecovery(grammar, source)
+        self.parser = ParserWithRecovery(grammar, u(source))
         return self.parser.module
 
     def parse(self, source, copies=0, parsers=0, expect_error_leaves=False):