diff --git a/tests/admin_views/admin.py b/tests/admin_views/admin.py
index aa040138e0..1def206df7 100644
--- a/tests/admin_views/admin.py
+++ b/tests/admin_views/admin.py
@@ -15,6 +15,7 @@ from django.contrib.auth.models import Group, User
 from django.core.exceptions import ValidationError
 from django.core.files.storage import FileSystemStorage
 from django.core.mail import EmailMessage
+from django.db import models
 from django.forms.models import BaseModelFormSet
 from django.http import HttpResponse, StreamingHttpResponse
 from django.utils.safestring import mark_safe
@@ -654,6 +655,7 @@ class RelatedPrepopulatedInline1(admin.StackedInline):
             'fields': (('pubdate', 'status'), ('name', 'slug1', 'slug2',),)
         }),
     )
+    formfield_overrides = {models.CharField: {'strip': False}}
     model = RelatedPrepopulated
     extra = 1
     prepopulated_fields = {'slug1': ['name', 'pubdate'],
@@ -674,6 +676,7 @@ class MainPrepopulatedAdmin(admin.ModelAdmin):
             'fields': (('pubdate', 'status'), ('name', 'slug1', 'slug2',),)
         }),
     )
+    formfield_overrides = {models.CharField: {'strip': False}}
     prepopulated_fields = {'slug1': ['name', 'pubdate'],
                            'slug2': ['status', 'name']}
 
diff --git a/tests/forms_tests/views.py b/tests/forms_tests/views.py
index 2081e0af14..44e4c84344 100644
--- a/tests/forms_tests/views.py
+++ b/tests/forms_tests/views.py
@@ -1,9 +1,18 @@
+from django import forms
 from django.views.generic.edit import UpdateView
 
 from .models import Article
 
 
+class ArticleForm(forms.ModelForm):
+    content = forms.CharField(strip=False, widget=forms.Textarea)
+
+    class Meta:
+        model = Article
+        fields = '__all__'
+
+
 class ArticleFormView(UpdateView):
     model = Article
     success_url = '/'
-    fields = '__all__'
+    form_class = ArticleForm