diff --git a/.gitignore b/.gitignore
index 81e7db3db80242e5a807acef2dfc4cd59ff54b29..8c026612a6238fef6b431ef4b170b9f4ed17bb4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,5 +9,5 @@
 *~
 *.bak
 .coq-native/
-Makefile.coq
+Makefile.coq*
 *.crashcoqide
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 060f4d34978c1076d7d44bda15a954f56a239493..b625b89434522a4374dedc1ea2c4276d2f9d4299 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,6 +23,12 @@ variables:
   - master
   - /^ci/
 
+iris-coq8.7:
+  <<: *template
+  variables:
+    COQ_VERSION: "8.7.dev"
+    SSR_VERSION: "dev"
+
 iris-coq8.6.1:
   <<: *template
   variables:
diff --git a/opam b/opam
index aaaa1597213176b5ae59b84cdc94bcf9dd0a0929..ec5e2b4c3889059edfceb9dd348e2f4bb576cc12 100644
--- a/opam
+++ b/opam
@@ -13,7 +13,7 @@ build: [
 install: [make "install"]
 remove: [ "sh" "-c" "rm -rf '%{lib}%/coq/user-contrib/iris'" ]
 depends: [
-  "coq" { (>= "8.6.1" & < "8.7~") } # replace with (= "dev") if you want to test against a development version of Coq
+  "coq" { (>= "8.6.1" & < "8.8~") } # replace with (= "dev") if you want to test against a development version of Coq
   "coq-mathcomp-ssreflect" { ((>= "1.6.1" & < "1.7~") | (= "dev")) }
   "coq-stdpp"
 ]
diff --git a/opam.pins b/opam.pins
index d9fa24e4f5d8ae66507830c27669d190ae3e70ed..b685c00b81bfb08a29c11823c6c1d399b8b9e98c 100644
--- a/opam.pins
+++ b/opam.pins
@@ -1 +1 @@
-coq-stdpp https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp 24cc2e4786b2344e092e412f56e96c6971ab60d8
+coq-stdpp https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp fa6ff9d18aefb29e839e815aa170262d330bd108