diff --git a/models/state.py b/models/state.py
index ddaa55e0011c..56d2b34e64af 100644
--- a/models/state.py
+++ b/models/state.py
@@ -9,9 +9,13 @@
 class State(BaseModel, Base):
     """ State class """
 
-    __tablename__ = 'states'
-    name = Column(String(128), nullable=False)
-    cities = relationship('City', cascade='all, delete', backref='state')
+    if os.environ.get('HBNB_TYPE_STORAGE') == 'db':
+        __tablename__ = 'states'
+        name = Column(String(128), nullable=False)
+        cities = relationship('City', cascade='all, delete', backref='state')
+    else:
+        name = ""
+        cities = []
 
     @property
     def cities(self):
diff --git a/models/user.py b/models/user.py
index 58b745eecc22..ed1357c3a359 100644
--- a/models/user.py
+++ b/models/user.py
@@ -10,13 +10,22 @@
 class User(BaseModel, Base):
     """This class defines a user by various attributes"""
 
-    __tablename__ = 'users'
-    email = Column(String(128), nullable=False)
-    password = Column(String(128), nullable=False)
-    first_name = Column(String(128))
-    last_name = Column(String(128))
+    if os.environ.get('HBNB_TYPE_STORAGE') == 'db':
+        __tablename__ = 'users'
+        email = Column(String(128), nullable=False)
+        password = Column(String(128), nullable=False)
+        first_name = Column(String(128))
+        last_name = Column(String(128))
 
-    places = relationship('Place', cascade='all, delete',
-                          backref='user')
-    reviews = relationship('Review', cascade='all, delete',
-                           backref='user')
+        places = relationship('Place', cascade='all, delete',
+                              backref='user')
+        reviews = relationship('Review', cascade='all, delete',
+                               backref='user')
+    else:
+        email = ""
+        password = ""
+        first_name = ""
+        last_name = ""
+
+        places = []
+        reviews = []