diff --git a/test-suite/tests/srfi-17.test b/test-suite/tests/srfi-17.test
index 6f0cd81f3..20f4dbba9 100644
--- a/test-suite/tests/srfi-17.test
+++ b/test-suite/tests/srfi-17.test
@@ -1,7 +1,7 @@
-;;;; srfi-17.test --- test suite for Guile's SRFI-17 functions. -*- scheme -*-
+;;;; srfi-17.test --- Test suite for Guile's SRFI-17 functions. -*- scheme -*-
+;;;;
+;;;; Copyright 2005 Free Software Foundation, Inc.
 ;;;;
-;;;; Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-;;;; 
 ;;;; This program is free software; you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
 ;;;; the Free Software Foundation; either version 2, or (at your option)
@@ -16,20 +16,59 @@
 ;;;; along with this software; see the file COPYING.  If not, write to
 ;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 ;;;; Boston, MA 02111-1307 USA
+;;;;
+;;;; As a special exception, the Free Software Foundation gives permission
+;;;; for additional uses of the text contained in its release of GUILE.
+;;;;
+;;;; The exception is that, if you link the GUILE library with other files
+;;;; to produce an executable, this does not by itself cause the
+;;;; resulting executable to be covered by the GNU General Public License.
+;;;; Your use of that executable is in no way restricted on account of
+;;;; linking the GUILE library code into it.
+;;;;
+;;;; This exception does not however invalidate any other reasons why
+;;;; the executable file might be covered by the GNU General Public License.
+;;;;
+;;;; This exception applies only to the code released by the
+;;;; Free Software Foundation under the name GUILE.  If you copy
+;;;; code from other Free Software Foundation releases into a copy of
+;;;; GUILE, as the General Public License permits, the exception does
+;;;; not apply to the code that you add in this way.  To avoid misleading
+;;;; anyone as to the status of such modified files, you must delete
+;;;; this exception notice from them.
+;;;;
+;;;; If you write modifications of your own for GUILE, it is your choice
+;;;; whether to permit this exception to apply to your modifications.
+;;;; If you do not wish that, delete this exception notice.  
 
 (define-module (test-suite test-srfi-17)
-  :use-module (test-suite lib)
-  :use-module (srfi srfi-17))
+  #:use-module (test-suite lib)
+  #:use-module (srfi srfi-17))
 
 
-(with-test-prefix "set!"
+(pass-if "cond-expand srfi-17"
+  (cond-expand (srfi-17 #t)
+	       (else    #f)))
 
-  (with-test-prefix "target is not procedure with setter"
+;;
+;; car
+;;
 
-    (pass-if-exception "(set! (symbol->string 'x) 1)"
-      exception:wrong-type-arg
-      (set! (symbol->string 'x) 1))
+(with-test-prefix "car"
 
-    (pass-if-exception "(set! '#f 1)"
-      exception:bad-variable
-      (eval '(set! '#f 1) (interaction-environment)))))
+  (pass-if "set! (car x)"
+    (let ((lst (list 1)))
+      (set! (car lst) 2)
+      (eqv? 2 (car lst)))))
+
+;;
+;; setter
+;;
+
+(with-test-prefix "setter"
+
+  (pass-if-exception "set! (setter x)" (cons 'misc-error ".*")
+    (set! (setter car) noop))
+
+  (pass-if "car"
+    (eq? set-car! (setter car))))