diff --git a/tests/docker/armadillo/standard/config/application.yml b/tests/docker/armadillo/standard/config/application.yml
index 54e90c36..be4ed07d 100644
--- a/tests/docker/armadillo/standard/config/application.yml
+++ b/tests/docker/armadillo/standard/config/application.yml
@@ -14,7 +14,7 @@ armadillo:
   # oidc-admin-user: user@yourdomain.org
   profiles:
     - name: default
-      image: datashield/rock-quebrada-lamda-permissive:latest
+      image: datashield/rock_citest-permissive:latest
       port: 8085
       host: default
       package-whitelist: # Packages for 'permissive'
diff --git a/tests/testthat.R b/tests/testthat.R
index 389ee66c..b262d97d 100644
--- a/tests/testthat.R
+++ b/tests/testthat.R
@@ -9,5 +9,8 @@
 library(testthat)
 library(dsBaseClient)
 
-if (identical(Sys.getenv("NOT_CRAN"), "true"))
+if (identical(Sys.getenv("NOT_CRAN"), "true")) {
+    ufq_opt <- base::options(useFancyQuotes = FALSE)
     test_check("dsBaseClient")
+    base::options(useFancyQuotes = ufq_opt)
+}
diff --git a/tests/testthat/connection_to_datasets/login_details.R b/tests/testthat/connection_to_datasets/login_details.R
index 81395474..2ce4ca2d 100644
--- a/tests/testthat/connection_to_datasets/login_details.R
+++ b/tests/testthat/connection_to_datasets/login_details.R
@@ -22,12 +22,12 @@ if (! is.null(getOption("default_driver"))) {
 }
 
 if ((ds.test_env$driver == "DSLiteDriver") || (ds.test_env$driver == "OpalDriver")) {
-    ds.test_env$ping_address <- paste("http://", ds.test_env$server_ip_address, ":8080", sep="")
-    ds.test_env$ping_config  <- config(timeout=5)
+    ds.test_env$ping_address <- paste("https://", ds.test_env$server_ip_address, ":8443", sep="")
+    ds.test_env$ping_config  <- config(timeout=5, ssl_verifyhost=0, ssl_verifypeer=0)
 
-    ds.test_env$ip_address_1 <- paste("http://", ds.test_env$server_ip_address, ":8080", sep="")
-    ds.test_env$ip_address_2 <- paste("http://", ds.test_env$server_ip_address, ":8080", sep="")
-    ds.test_env$ip_address_3 <- paste("http://", ds.test_env$server_ip_address, ":8080", sep="")
+    ds.test_env$ip_address_1 <- paste("https://", ds.test_env$server_ip_address, ":8443", sep="")
+    ds.test_env$ip_address_2 <- paste("https://", ds.test_env$server_ip_address, ":8443", sep="")
+    ds.test_env$ip_address_3 <- paste("https://", ds.test_env$server_ip_address, ":8443", sep="")
 
     ds.test_env$user_1 <- getOption("opal.user", "administrator")
     ds.test_env$user_2 <- getOption("opal.user", "administrator")
@@ -37,9 +37,9 @@ if ((ds.test_env$driver == "DSLiteDriver") || (ds.test_env$driver == "OpalDriver
     ds.test_env$password_2 <- getOption("opal.password", "datashield_test&")
     ds.test_env$password_3 <- getOption("opal.password", "datashield_test&")
 
-    ds.test_env$options_1 <- "list()"
-    ds.test_env$options_2 <- "list()"
-    ds.test_env$options_3 <- "list()"
+    ds.test_env$options_1 <- "list(ssl_verifyhost=0, ssl_verifypeer=0)"
+    ds.test_env$options_2 <- "list(ssl_verifyhost=0, ssl_verifypeer=0)"
+    ds.test_env$options_3 <- "list(ssl_verifyhost=0, ssl_verifypeer=0)"
 
     ds.test_env$secure_login_details <- TRUE
 } else if (ds.test_env$driver == "ArmadilloDriver") {
diff --git a/tests/testthat/setup.R b/tests/testthat/setup.R
index 5980e9df..02275ef1 100644
--- a/tests/testthat/setup.R
+++ b/tests/testthat/setup.R
@@ -33,6 +33,7 @@ source("connection_to_datasets/init_testing_datasets.R")
 source("connection_to_datasets/init_studies_datasets.R")
 source("connection_to_datasets/init_discordant_datasets.R")
 source("connection_to_datasets/init_mediation_datasets.R")
-options(datashield.errors.print = FALSE)
+base::options(datashield.errors.print = FALSE)
+base::options(useFancyQuotes = FALSE)
 
 # context("setup - done")