diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5d85b9f76b..8c46640c94 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -111,11 +111,13 @@ anchor_test_ruby_client: &anchor_test_ruby_client
   command: |
     if [ -e ${RUBY_GEN_DIR}/google-cloud-${TEST_API} ]
     then
+      echo "Testing ${TEST_API} in the ${LANGUAGE} language"
       cd ${RUBY_GEN_DIR}/google-cloud-${TEST_API}
       bundle update
       bundle exec rake test
     else
-      echo "Ruby ${TEST_API} library was not generated."
+      echo "Ruby ${TEST_API} library was not generated for ${LANGUAGE} at ${RUBY_GEN_DIR}."
+      ls -la ${RUBY_GEN_DIR}
       exit 1
     fi
   when: always
@@ -133,6 +135,10 @@ anchor_run_ruby: &anchor_run_ruby
     - attach_workspace:
         # Use the workspace created in generate-clients
         at: workspace
+    - run:
+        name: Prepare environment # The environment set for this job does not seem to propagate
+        command: |
+          echo 'export RUBY_GEN_DIR="/tmp/workspace/gapic-generator/artman-genfiles/ruby/google-cloud-ruby/"' >> $BASH_ENV
     - run:
         <<: *anchor_run_decrypt
     - run:
diff --git a/src/main/proto/com/google/api/codegen/samplegen/v1p2/sample_config_v1p2.proto b/src/main/proto/com/google/api/codegen/samplegen/v1p2/sample_config_v1p2.proto
index 2e615d72ef..557a9375fc 100644
--- a/src/main/proto/com/google/api/codegen/samplegen/v1p2/sample_config_v1p2.proto
+++ b/src/main/proto/com/google/api/codegen/samplegen/v1p2/sample_config_v1p2.proto
@@ -86,6 +86,15 @@ message SampleSpecProto {
   // Definition of how to handle the RPC response, specified as an
   // ordered list of statements.
   repeated ResponseStatementProto response = 9;
+
+  // A list of the types samples to generate from this
+  // configuration. The elements can be any of "standalone" and
+  // "incode/XXX", where XXX is an arbitrary run of alphanumeric
+  // characters (these are used to lexicographically sort multiple
+  // in-code samples for the same RPC when including them in the
+  // library source code). If not specified or empty, defaults to
+  // ["standalone"]
+  repeated string sample_type = 10;
 }
 
 message RequestFieldProto {