diff --git a/moto/eb/models.py b/moto/eb/models.py
index c3c2aa20c..fa7345f0d 100644
--- a/moto/eb/models.py
+++ b/moto/eb/models.py
@@ -11,10 +11,12 @@ class FakeEnvironment(BaseModel):
             self,
             application,
             environment_name,
+            solution_stack_name,
             tags,
     ):
         self.application = weakref.proxy(application)  # weakref to break circular dependencies
         self.environment_name = environment_name
+        self.solution_stack_name = solution_stack_name
         self.tags = tags
 
     @property
@@ -35,10 +37,6 @@ class FakeEnvironment(BaseModel):
     def platform_arn(self):
         return 'TODO'  # TODO
 
-    @property
-    def solution_stack_name(self):
-        return 'TODO'  # TODO
-
     @property
     def region(self):
         return self.application.region
@@ -53,6 +51,7 @@ class FakeApplication(BaseModel):
     def create_environment(
             self,
             environment_name,
+            solution_stack_name,
             tags,
     ):
         if environment_name in self.environments:
@@ -61,6 +60,7 @@ class FakeApplication(BaseModel):
         env = FakeEnvironment(
             application=self,
             environment_name=environment_name,
+            solution_stack_name=solution_stack_name,
             tags=tags,
         )
         self.environments[environment_name] = env
diff --git a/moto/eb/responses.py b/moto/eb/responses.py
index fbace1938..c93efc3a1 100644
--- a/moto/eb/responses.py
+++ b/moto/eb/responses.py
@@ -31,7 +31,6 @@ class EBResponse(BaseResponse):
 
     def create_environment(self):
         application_name = self._get_param('ApplicationName')
-        environment_name = self._get_param('EnvironmentName')
         try:
             app = self.backend.applications[application_name]
         except KeyError:
@@ -41,7 +40,8 @@ class EBResponse(BaseResponse):
 
         tags = tags_from_query_string(self.querystring, prefix="Tags.member")
         env = app.create_environment(
-            environment_name=environment_name,
+            environment_name=self._get_param('EnvironmentName'),
+            solution_stack_name=self._get_param('SolutionStackName'),
             tags=tags,
         )