diff --git a/test/distrib/csharp/.gitignore b/test/distrib/csharp/.gitignore
index cb4b0a92127db8d9a2f09737e34b963e7f43fb18..52503c7b30d5b51bc79c0bd8b7657a2d4f6fd25d 100644
--- a/test/distrib/csharp/.gitignore
+++ b/test/distrib/csharp/.gitignore
@@ -2,4 +2,5 @@ packages
 *.userprefs
 *.csproj.user
 *.suo
-/TestNugetFeed
\ No newline at end of file
+/TestNugetFeed
+
diff --git a/test/distrib/csharp/NuGet.Config b/test/distrib/csharp/NuGet.Config
index 62b82684bc2475eeb9e9e69a47e9eb0f10ca663e..e3b63c51687e05867b72728fb8a6fa351be48420 100644
--- a/test/distrib/csharp/NuGet.Config
+++ b/test/distrib/csharp/NuGet.Config
@@ -4,4 +4,5 @@
     <add key="https://www.nuget.org/api/v2/" value="https://www.nuget.org/api/v2/" />
     <add key="TestNugetFeed" value="TestNugetFeed" />
   </packageSources>
-</configuration>
\ No newline at end of file
+</configuration>
+
diff --git a/test/distrib/csharp/update_version.sh b/test/distrib/csharp/update_version.sh
index 1df8466832437c7d440548224124d1840a80989f..0734fe2cd7a62003bdf4c4d7f0c4a13321d4fcb3 100755
--- a/test/distrib/csharp/update_version.sh
+++ b/test/distrib/csharp/update_version.sh
@@ -5,4 +5,4 @@ set -e
 cd $(dirname $0)
 
 # Replaces version placeholder with value provided as first argument.
-sed -i "s/__GRPC_NUGET_VERSION__/$1/g" DistribTest/packages.config DistribTest/DistribTest.csproj
\ No newline at end of file
+sed -i "s/__GRPC_NUGET_VERSION__/$1/g" DistribTest/packages.config DistribTest/DistribTest.csproj
diff --git a/tools/dockerfile/distribtest/csharp_jessie_x64/Dockerfile b/tools/dockerfile/distribtest/csharp_jessie_x64/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..c957a6deeea4006a197cebb3bcc538e23a71891e
--- /dev/null
+++ b/tools/dockerfile/distribtest/csharp_jessie_x64/Dockerfile
@@ -0,0 +1,47 @@
+# Copyright 2015, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+FROM debian:jessie
+
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+RUN echo "deb http://download.mono-project.com/repo/debian wheezy main" | tee /etc/apt/sources.list.d/mono-xamarin.list
+RUN echo "deb http://download.mono-project.com/repo/debian wheezy-apache24-compat main" | tee -a /etc/apt/sources.list.d/mono-xamarin.list
+RUN echo "deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main" | tee -a /etc/apt/sources.list.d/mono-xamarin.list
+RUN echo "deb http://download.mono-project.com/repo/debian wheezy-libtiff-compat main" | tee -a /etc/apt/sources.list.d/mono-xamarin.list
+
+RUN apt-get update && apt-get -y dist-upgrade && apt-get install -y \
+    mono-devel \
+    ca-certificates-mono \
+    nuget
+
+RUN apt-get update && apt-get install -y git unzip
+
+# TODO(jtattermusch): Currently P/Invoke to dlopen will fail without libc6-dev
+# being installed. Figure out how to workaround this.
+RUN apt-get update && apt-get install -y libc6-dev
diff --git a/tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile b/tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..40cc19e95335b108836068a26ada30e839c10a90
--- /dev/null
+++ b/tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile
@@ -0,0 +1,47 @@
+# Copyright 2015, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+FROM 32bit/debian:jessie
+
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+RUN echo "deb http://download.mono-project.com/repo/debian wheezy main" | tee /etc/apt/sources.list.d/mono-xamarin.list
+RUN echo "deb http://download.mono-project.com/repo/debian wheezy-apache24-compat main" | tee -a /etc/apt/sources.list.d/mono-xamarin.list
+RUN echo "deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main" | tee -a /etc/apt/sources.list.d/mono-xamarin.list
+RUN echo "deb http://download.mono-project.com/repo/debian wheezy-libtiff-compat main" | tee -a /etc/apt/sources.list.d/mono-xamarin.list
+
+RUN apt-get update && apt-get -y dist-upgrade && apt-get install -y \
+    mono-devel \
+    ca-certificates-mono \
+    nuget
+
+RUN apt-get update && apt-get install -y git unzip
+
+# TODO(jtattermusch): Currently P/Invoke to dlopen will fail without libc6-dev
+# being installed. Figure out how to workaround this.
+RUN apt-get update && apt-get install -y libc6-dev
diff --git a/tools/dockerfile/grpc_tests_distrib_csharp/Dockerfile b/tools/dockerfile/distribtest/csharp_wheezy_x64/Dockerfile
similarity index 89%
rename from tools/dockerfile/grpc_tests_distrib_csharp/Dockerfile
rename to tools/dockerfile/distribtest/csharp_wheezy_x64/Dockerfile
index 9ebd3ca60eb0f612b68792fb9e44a01d78a4b615..cc8f243d8cf0b7baa29cc1c67b8a72a27bf3808f 100644
--- a/tools/dockerfile/grpc_tests_distrib_csharp/Dockerfile
+++ b/tools/dockerfile/distribtest/csharp_wheezy_x64/Dockerfile
@@ -30,3 +30,7 @@
 FROM mono:4.2.2.30
 
 RUN apt-get update && apt-get install -y git unzip
+
+# TODO(jtattermusch): Currently P/Invoke to dlopen will fail without libc6-dev
+# being installed. Figure out how to workaround this.
+RUN apt-get update && apt-get install -y libc6-dev
diff --git a/tools/run_tests/distribtest_targets.py b/tools/run_tests/distribtest_targets.py
index 121da470fe70d27c90ff8b0c54868e722db4814d..aa1d55aedd2fd19feeea6ca52a50ef330e60b094 100644
--- a/tools/run_tests/distribtest_targets.py
+++ b/tools/run_tests/distribtest_targets.py
@@ -57,10 +57,11 @@ def create_docker_jobspec(name, dockerfile_dir, shell_command, environ={},
 class CSharpDistribTest:
   """Tests C# NuGet package"""
 
-  def __init__(self, platform, arch):
-    self.name = 'csharp_nuget_%s_%s' % (platform, arch)
+  def __init__(self, platform, arch, docker_suffix):
+    self.name = 'csharp_nuget_%s_%s_%s' % (platform, arch, docker_suffix)
     self.platform = platform
     self.arch = arch
+    self.docker_suffix = docker_suffix
     self.labels = ['distribtest', 'csharp', platform, arch]
 
   def pre_build_jobspecs(self):
@@ -71,7 +72,9 @@ class CSharpDistribTest:
       raise Exception("Not supported yet.")
 
     return create_docker_jobspec(self.name,
-          'tools/dockerfile/grpc_tests_distrib_csharp',
+          'tools/dockerfile/distribtest/csharp_%s_%s' % (
+              self.docker_suffix,
+              self.arch),
           'test/distrib/csharp/run_distrib_test.sh')
 
   def __str__(self):
@@ -80,4 +83,6 @@ class CSharpDistribTest:
 
 def targets():
   """Gets list of supported targets"""
-  return [CSharpDistribTest('linux', 'x64')]
+  return [CSharpDistribTest('linux', 'x64', 'wheezy'),
+          CSharpDistribTest('linux', 'x64', 'jessie'),
+          CSharpDistribTest('linux', 'x86', 'jessie')]