diff --git a/interpreter/cling/test/Extensions/Lookup/SymbolResolverCallback.h b/interpreter/cling/test/Extensions/Lookup/SymbolResolverCallback.h
index 83a1d0c58c4e978b8207122e080edc2ef6b00e66..db21137fe502e167d9ef84c9c938414617b0bc41 100644
--- a/interpreter/cling/test/Extensions/Lookup/SymbolResolverCallback.h
+++ b/interpreter/cling/test/Extensions/Lookup/SymbolResolverCallback.h
@@ -12,7 +12,6 @@
 
 #include "cling/Utils/AST.h"
 
-#include "clang/Frontend/CompilerInstance.h"
 #include "clang/Sema/Lookup.h"
 
 namespace cling {
@@ -74,7 +73,7 @@ namespace cling {
         // Only for demo resolve all unknown objects to cling::test::Tester
         if (m_Enabled) {
           if (!m_TesterDecl) {
-            clang::Sema& S = m_Interpreter->getCI()->getSema();
+            clang::Sema& S = m_Interpreter->getSema();
             clang::NamespaceDecl* NSD = utils::Lookup::Namespace(&S, "cling");
             NSD = utils::Lookup::Namespace(&S, "test", NSD);
             m_TesterDecl = utils::Lookup::Named(&S, "Tester", NSD);
diff --git a/interpreter/cling/test/Interfaces/address.C b/interpreter/cling/test/Interfaces/address.C
index 8ad693aca7b52dd362e145869dd010064685cc82..fa17a00f9fcf2880f8f7e287131404ad509762d9 100644
--- a/interpreter/cling/test/Interfaces/address.C
+++ b/interpreter/cling/test/Interfaces/address.C
@@ -5,7 +5,6 @@ extern "C" int printf(const char*,...);
 #include "cling/Interpreter/Interpreter.h"
 #include "cling/Utils/AST.h"
 #include "clang/AST/Decl.h"
-#include "clang/Frontend/CompilerInstance.h"
 .rawInput
 const char* comp(void* A, void* B) {
   if (A == B) { return "equal"; }
@@ -14,7 +13,7 @@ const char* comp(void* A, void* B) {
 .rawInput
 
 bool fromJIT = false;
-clang::Sema& sema = gCling->getCI()->getSema();
+clang::Sema& sema = gCling->getSema();
 int gMyGlobal = 12;
 void* addr1 = &gMyGlobal;
 clang::NamedDecl* D = cling::utils::Lookup::Named(&sema, "gMyGlobal");
diff --git a/interpreter/cling/test/LibraryCall/callable_lib.C b/interpreter/cling/test/LibraryCall/callable_lib.C
index 1bf9f8829208382c02809b2f9a2f468f7041be68..3b889fc72e1d1b29b2fe153c0aea8fee2c89204c 100644
--- a/interpreter/cling/test/LibraryCall/callable_lib.C
+++ b/interpreter/cling/test/LibraryCall/callable_lib.C
@@ -8,10 +8,10 @@ extern "C" int cling_testlibrary_function();
 #include "cling/Interpreter/Interpreter.h"
 #include "cling/Interpreter/Value.h"
 #include "cling/Interpreter/Callable.h"
-#include "clang/Frontend/CompilerInstance.h"
+#include "clang/Sema/Sema.h"
 #include "clang/AST/ASTContext.h"
 
-const clang::Decl* TU = gCling->getCI()->getASTContext().getTranslationUnitDecl();
+const clang::Decl* TU = gCling->Sema().getASTContext().getTranslationUnitDecl();
 const clang::FunctionDecl* F = gCling->lookupFunctionProto(TU, "cling_testlibrary_function", "");
 assert(F && "cling_testlibrary_function() decl not found");
 cling::Callable Call(*F, *gCling);
diff --git a/interpreter/cling/test/Lookup/args.C b/interpreter/cling/test/Lookup/args.C
index bc14bb3c3ea20f6e56b123b911a76bb6a6df4ef4..c868b2a075cc9d94875dad21332aeca83129e21e 100644
--- a/interpreter/cling/test/Lookup/args.C
+++ b/interpreter/cling/test/Lookup/args.C
@@ -5,7 +5,6 @@
 #include "cling/Interpreter/LookupHelper.h"
 
 #include "clang/AST/Expr.h"
-#include "clang/Frontend/CompilerInstance.h"
 
 #include "llvm/ADT/SmallVector.h"
 
@@ -24,8 +23,8 @@ clang::PrintingPolicy Policy(G->getASTContext().getPrintingPolicy());
 
 lookup.findArgList("a, a", exprs);
 
-exprs[0]->dumpPretty(getCI()->getASTContext());
+exprs[0]->dumpPretty(gCling->getSema().getASTContext());
 //CHECK: a
-exprs[1]->dumpPretty(getCI()->getASTContext());
+exprs[1]->dumpPretty(gCling->getSema().getASTContext());
 //CHECK: a
 .q
diff --git a/interpreter/cling/test/Utils/Transform.C b/interpreter/cling/test/Utils/Transform.C
index 03fb790199b7693821bddb6d081f2df6baa87829..b1b3871884118b07f9145095ac378f6906729026 100644
--- a/interpreter/cling/test/Utils/Transform.C
+++ b/interpreter/cling/test/Utils/Transform.C
@@ -8,7 +8,7 @@
 #include "cling/Utils/AST.h"
 #include "clang/AST/Type.h"
 #include "llvm/ADT/SmallSet.h"
-#include "clang/Frontend/CompilerInstance.h"
+#include "clang/Sema/Sema.h"
 
 .rawInput 1
 
@@ -50,7 +50,7 @@ namespace NS {
 
 const cling::LookupHelper& lookup = gCling->getLookupHelper();
 
-const clang::ASTContext& Ctx = gCling->getCI()->getASTContext();
+const clang::ASTContext& Ctx = gCling->getSema().getASTContext();
 llvm::SmallSet<const clang::Type*, 4> skip;
 skip.insert(lookup.findType("Double32_t").getTypePtr());
 const clang::Type* t = 0;