diff --git a/.travis.yml b/.travis.yml
index 81fc79f98..18528fbd3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,11 @@ language: c
 git:
   submodules: false
 
+banches:
+  only:
+  - master
+  - coq-master
+
 install:
  - curl -sL https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh > install.sh
  - echo | sudo sh install.sh
diff --git a/src/coq_elpi_builtins.ml b/src/coq_elpi_builtins.ml
index 7f17fde9f..b6e0e27e0 100644
--- a/src/coq_elpi_builtins.ml
+++ b/src/coq_elpi_builtins.ml
@@ -861,16 +861,24 @@ It undestands qualified names, e.g. "Nat.t".|})),
        | Given ty ->
        let used = EConstr.universes_of_constr sigma ty in
        let sigma = Evd.restrict_universe_context sigma used in
+       let ubinders = Evd.universe_binders sigma in
+       let uentry = Evd.univ_entry ~poly:false sigma in
        let kind = Decls.Logical in
        let impargs = [] in
        let variable = CAst.(make @@ Id.of_string id) in
        let gr, _ =
          if local then begin
+           let uctx =
+              let context_set_of_entry = function
+                | Entries.Polymorphic_entry (_,uctx) -> Univ.ContextSet.of_context uctx
+                | Entries.Monomorphic_entry uctx -> uctx in
+              context_set_of_entry uentry in
+           Declare.declare_universe_context ~poly:false uctx;
            ComAssumption.declare_variable false ~kind (EConstr.to_constr sigma ty) impargs Glob_term.Explicit variable;
            GlobRef.VarRef(Id.of_string id), Univ.Instance.empty
          end else
            ComAssumption.declare_axiom false ~local:Declare.ImportDefaultBehavior ~poly:false ~kind (EConstr.to_constr sigma ty)
-             (Evd.univ_entry ~poly:false sigma, UnivNames.empty_binders) impargs Declaremods.NoInline
+             (uentry, ubinders) impargs Declaremods.NoInline
              variable
        in
        state, !: (global_constant_of_globref gr), []
diff --git a/theories/tests/test_HOAS.v b/theories/tests/test_HOAS.v
index bc744ddd3..9997c2789 100644
--- a/theories/tests/test_HOAS.v
+++ b/theories/tests/test_HOAS.v
@@ -87,3 +87,11 @@ Elpi Accumulate lp:{{
 Elpi Typecheck.
 
 Elpi kwd fun in as 4 end match return => : := { } ; , | "x" 1 H (match x as y in False return nat with end).
+
+Elpi Query lp:{{
+  coq.env.begin-section "xxxxx",
+  coq.univ.new [] U,
+  T = sort (typ U),
+  coq.env.add-const "a" _ T tt tt _,
+  coq.env.end-section
+}}.
\ No newline at end of file