diff --git a/Cargo.toml b/Cargo.toml
index a0febc44e..a34e834b6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,6 +5,7 @@ members = [
     "tonic-examples",
     "tonic-interop",
 
+    "tests/included_service",
     "tests/same_name",
     "tests/wellknown",
 ]
diff --git a/tests/included_service/Cargo.toml b/tests/included_service/Cargo.toml
new file mode 100644
index 000000000..c70a3eb87
--- /dev/null
+++ b/tests/included_service/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "included_service"
+version = "0.1.0"
+authors = ["Lucio Franco <luciofranco14@gmail.com>"]
+edition = "2018"
+publish = false
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+tonic = { path = "../../tonic" }
+bytes = "0.4"
+prost = "0.5"
+
+[build-dependencies]
+tonic-build = { path = "../../tonic-build" }
diff --git a/tests/included_service/build.rs b/tests/included_service/build.rs
new file mode 100644
index 000000000..1c29065b1
--- /dev/null
+++ b/tests/included_service/build.rs
@@ -0,0 +1,3 @@
+fn main() {
+    tonic_build::compile_protos("proto/includer.proto").unwrap();
+}
diff --git a/tests/included_service/proto/includee.proto b/tests/included_service/proto/includee.proto
new file mode 100644
index 000000000..c2aebc04c
--- /dev/null
+++ b/tests/included_service/proto/includee.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+package includee;
+
+service Included {
+  rpc SomeMethod(SomeRequest) returns (SomeResponse) {}
+}
+
+message SomeRequest {}
+
+message SomeResponse {}
diff --git a/tests/included_service/proto/includer.proto b/tests/included_service/proto/includer.proto
new file mode 100644
index 000000000..8f283d6c1
--- /dev/null
+++ b/tests/included_service/proto/includer.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+package includer;
+
+message TopMessage {}
+
+service TopService {
+  rpc TopMethod(TopMessage) returns (TopMessage) {}
+}
+
+import "includee.proto";
diff --git a/tests/included_service/src/lib.rs b/tests/included_service/src/lib.rs
new file mode 100644
index 000000000..d8e6f1026
--- /dev/null
+++ b/tests/included_service/src/lib.rs
@@ -0,0 +1,8 @@
+pub mod pb {
+    tonic::include_proto!("includer");
+}
+
+// Ensure that an RPC service, defined before including a file that defines
+// another service in a different protocol buffer package, is not incorrectly
+// cleared from the context of its package.
+type _Test = dyn pb::server::TopService;
diff --git a/tonic-build/src/lib.rs b/tonic-build/src/lib.rs
index b6e28d8b9..6b9cac5fe 100644
--- a/tonic-build/src/lib.rs
+++ b/tonic-build/src/lib.rs
@@ -262,6 +262,8 @@ impl prost_build::ServiceGenerator for ServiceGenerator {
 
             let code = format!("{}", client_service);
             buf.push_str(&code);
+
+            self.clients = TokenStream::default();
         }
 
         if self.builder.build_server && !self.servers.is_empty() {
@@ -279,6 +281,8 @@ impl prost_build::ServiceGenerator for ServiceGenerator {
 
             let code = format!("{}", server_service);
             buf.push_str(&code);
+
+            self.servers = TokenStream::default();
         }
     }
 }