diff --git a/modules/openapi-generator/src/main/resources/r/README.mustache b/modules/openapi-generator/src/main/resources/r/README.mustache
index 718fddaac3e..ecad1f3c077 100644
--- a/modules/openapi-generator/src/main/resources/r/README.mustache
+++ b/modules/openapi-generator/src/main/resources/r/README.mustache
@@ -35,7 +35,7 @@ install.packages("base64enc")
 git clone https://{{gitHost}}/{{{gitUserId}}}/{{{gitRepoId}}}
 cd {{{gitRepoId}}}
 R CMD build .
-R CMD check {{{packageName}}}_{{{packageVersion}}}.tar.gz
+R CMD check {{{packageName}}}_{{{packageVersion}}}.tar.gz --no-manual
 R CMD INSTALL {{{packageName}}}_{{{packageVersion}}}.tar.gz
 ```
 
diff --git a/modules/openapi-generator/src/main/resources/r/model_test.mustache b/modules/openapi-generator/src/main/resources/r/model_test.mustache
index ee35a16fcc6..c8df23122cf 100644
--- a/modules/openapi-generator/src/main/resources/r/model_test.mustache
+++ b/modules/openapi-generator/src/main/resources/r/model_test.mustache
@@ -2,12 +2,15 @@
 # Please update as you see appropriate
 
 context("Test {{{classname}}}")
+{{#models}}
+{{#model}}
+{{^isEnum}}
+{{#vars}}
+{{#-first}}
 
 model.instance <- {{{classname}}}$new()
 
-{{#models}}
-{{#model}}
-{{#vars}}
+{{/-first}}
 test_that("{{{name}}}", {
   # tests for the property `{{{name}}}` ({{dataType}})
   {{#description}}
@@ -19,5 +22,6 @@ test_that("{{{name}}}", {
 })
 
 {{/vars}}
+{{/isEnum}}
 {{/model}}
 {{/models}}
diff --git a/samples/client/petstore/R/README.md b/samples/client/petstore/R/README.md
index c0a42298c37..52f29ededae 100644
--- a/samples/client/petstore/R/README.md
+++ b/samples/client/petstore/R/README.md
@@ -27,7 +27,7 @@ install.packages("base64enc")
 git clone https://github.com/GIT_USER_ID/GIT_REPO_ID
 cd GIT_REPO_ID
 R CMD build .
-R CMD check petstore_1.0.0.tar.gz
+R CMD check petstore_1.0.0.tar.gz --no-manual
 R CMD INSTALL petstore_1.0.0.tar.gz
 ```